diff options
Diffstat (limited to 'TAO/tao/Strategies/SHMIOP_Connector.cpp')
| -rw-r--r-- | TAO/tao/Strategies/SHMIOP_Connector.cpp | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index 9b0490b6c26..adba9338dc1 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -190,30 +190,19 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, return 0; } - if (svc_handler->keep_waiting ()) - { - svc_handler->connection_pending (); - } - - if (svc_handler->error_detected ()) - { - svc_handler->cancel_pending_connection (); - } - - TAO_Transport *transport = - svc_handler->transport (); - // At this point, the connection has be successfully connected. // #REFCOUNT# is one. if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SHMIOP_Connector::make_connection, " - "new %s connection to <%s:%d> on Transport[%d]\n", - transport->is_connected() ? "connected" : "not connected", + "new connection to <%s:%d> on Transport[%d]\n", ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), shmiop_endpoint->port (), svc_handler->peer ().get_handle ())); + TAO_Transport *transport = + svc_handler->transport (); + // Add the handler to Cache int retval = this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&desc, @@ -228,20 +217,13 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level > 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT("TAO (%P|%t) - SHMIOP_Connector::make_connection, ") - ACE_TEXT("could not add the new connection to cache\n"))); + "TAO (%P|%t) - SHMIOP_Connector::make_connection, " + "could not add the new connection to cache\n")); } return 0; } - if (svc_handler->error_detected ()) - { - svc_handler->cancel_pending_connection (); - transport->purge_entry(); - return 0; - } - if (transport->is_connected () && transport->wait_strategy ()->register_handler () != 0) { |