summaryrefslogtreecommitdiff
path: root/TAO/tao/RTCORBA
diff options
context:
space:
mode:
authormcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-12-07 09:48:57 +0000
committermcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-12-07 09:48:57 +0000
commit83501a40406107fe81373cac12fc8fec79f94bc9 (patch)
tree5e831d119eef6d0dbc1a2dc5e11a2207dd38646c /TAO/tao/RTCORBA
parent27662b94e8f5f6d572d247dc69a6298a551cf7f9 (diff)
downloadATCD-83501a40406107fe81373cac12fc8fec79f94bc9.tar.gz
Mon Dec 7 09:43:00 UTC 2009 Martin Corino <mcorino@remedy.nl>
* ACE_wrappers/TAO/tao/Thread_Lane_Resources.h: * ACE_wrappers/TAO/tao/Thread_Lane_Resources.cpp: * ACE_wrappers/TAO/tao/Thread_Lane_Resources_Manager.h: * ACE_wrappers/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp: * ACE_wrappers/TAO/tao/Default_Thread_Lane_Resources_Manager.h: * ACE_wrappers/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h: * ACE_wrappers/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp: * ACE_wrappers/TAO/tao/ORB_Core.cpp: Replaced #clear_rw_transports() method by #close_all_transports() method. This fixes Bugzilla #3672. Like before this behaviour is controlled by ORB option ORBDropRepliesDuringShutdown, which by default is on.
Diffstat (limited to 'TAO/tao/RTCORBA')
-rw-r--r--TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp4
-rw-r--r--TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h7
2 files changed, 5 insertions, 6 deletions
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index 56fa0ad820e..c2798081cab 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -82,10 +82,10 @@ TAO_RT_Thread_Lane_Resources_Manager::shutdown_reactor (void)
}
void
-TAO_RT_Thread_Lane_Resources_Manager::cleanup_rw_transports (void)
+TAO_RT_Thread_Lane_Resources_Manager::close_all_transports (void)
{
// Shutdown default reactors.
- this->default_lane_resources_->cleanup_rw_transports ();
+ this->default_lane_resources_->close_all_transports ();
}
int
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
index 9b96964b822..8e5ae0fe5ff 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
@@ -58,10 +58,9 @@ public:
/// Shutdown reactor.
void shutdown_reactor (void);
- /// Certain ORB policies such as dropping replies on shutdown with
- /// RW connection handlers would need cleanup of transports to wake
- /// threads up.
- void cleanup_rw_transports (void);
+ /// Certain ORB policies such as dropping replies on shutdown
+ /// would need cleanup of transports to wake threads up.
+ void close_all_transports (void);
/// Does @a mprofile belong to us?
int is_collocated (const TAO_MProfile &mprofile);