diff options
Diffstat (limited to 'TAO/tao/Strategies/SCIOP_Connection_Handler.cpp')
-rw-r--r-- | TAO/tao/Strategies/SCIOP_Connection_Handler.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index 72d72832118..4957d915f76 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -113,31 +113,26 @@ TAO_SCIOP_Connection_Handler::open (void*) bool client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (client) { tph->client_protocol_properties_at_orb_level ( protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { tph->server_protocol_properties_at_orb_level ( protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); if (this->set_socket_option (this->peer (), protocol_properties.send_buffer_size_, |