diff options
Diffstat (limited to 'TAO/tao/Acceptor_Impl.cpp')
| -rw-r--r-- | TAO/tao/Acceptor_Impl.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp index 026ada238eb..fa123ff5473 100644 --- a/TAO/tao/Acceptor_Impl.cpp +++ b/TAO/tao/Acceptor_Impl.cpp @@ -28,7 +28,6 @@ #include "tao/Server_Strategy_Factory.h" #include "tao/Connector_Registry.h" #include "tao/debug.h" -#include "ace/Object_Manager.h" #if !defined(__ACE_INLINE__) #include "tao/Acceptor_Impl.i" @@ -94,15 +93,9 @@ template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open (const ACE_PEER_ACCEPTOR_ADDR &local_addr, int restart) { - int result = ACCEPT_STRATEGY_BASE::open (local_addr, restart); -#if !defined (TAO_USES_ROBUST_CONNECTION_MGMT) - - return result; - -#else /* ! TAO_USES_ROBUST_CONNECTION_MGMT */ if (result == 0) return result; @@ -114,7 +107,6 @@ TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open (const ACE_PEER_ACCE // If we are able to purge, try again. return ACCEPT_STRATEGY_BASE::open (local_addr, restart); -#endif /* !TAO_USES_ROBUST_CONNECTION_MGMT */ } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int @@ -122,19 +114,16 @@ TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler (SVC_H { int result = ACCEPT_STRATEGY_BASE::accept_svc_handler (svc_handler); -#if defined (TAO_USES_ROBUST_CONNECTION_MGMT) if (result == 0) return result; // If the error occured due to the fact that the open handle limit // was exhausted, then purge some "old" connections. this->out_of_sockets_handler (); -#endif /* TAO_USES_ROBUST_CONNECTION_MGMT */ return result; } -#if defined (TAO_USES_ROBUST_CONNECTION_MGMT) template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (void) { @@ -144,9 +133,9 @@ TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (v // connection cache maintained by the connectors in the // connector registry. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "Purging connections from Connectors in Connector Registry of all ORBs...\n")); - + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), 0)); @@ -163,13 +152,12 @@ TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (v if (result != 0) return result; } - + return 0; } - + return -1; } -#endif /* TAO_USES_ROBUST_CONNECTION_MGMT */ //////////////////////////////////////////////////////////////////////////////// |