From 83501a40406107fe81373cac12fc8fec79f94bc9 Mon Sep 17 00:00:00 2001 From: mcorino Date: Mon, 7 Dec 2009 09:48:57 +0000 Subject: Mon Dec 7 09:43:00 UTC 2009 Martin Corino * 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. --- TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp | 4 ++-- TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'TAO/tao/RTCORBA') 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); -- cgit v1.2.1