diff options
Diffstat (limited to 'TAO/tao/Messaging/AMH_Response_Handler.cpp')
| -rw-r--r-- | TAO/tao/Messaging/AMH_Response_Handler.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index 0a1f3912dc9..45d42f11694 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -54,21 +54,17 @@ TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void) // If sending the exception to the client fails, then we just give // up, release the transport and return. - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code (TAO_AMH_REPLY_LOCATION_CODE, EFAULT), CORBA::COMPLETED_NO); - this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_tao_rh_send_exception (ex); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; - ACE_CHECK; } void @@ -86,7 +82,7 @@ TAO_AMH_Response_Handler::init(TAO_ServerRequest &server_request, } void -TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL) +TAO_AMH_Response_Handler::_tao_rh_init_reply (void) { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -99,7 +95,7 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL) // request and is now trying to send back the reply. Hence we // say that the operation has completed but let the server // anyway that it is not doing something right. - ACE_THROW (CORBA::BAD_INV_ORDER + throw ( ::CORBA::BAD_INV_ORDER (CORBA::SystemException::_tao_minor_code (TAO_AMH_REPLY_LOCATION_CODE, EEXIST), @@ -135,7 +131,7 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL) +TAO_AMH_Response_Handler::_tao_rh_send_reply (void) { { @@ -145,7 +141,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL) // server-app saying it is not doing something right. if (this->reply_status_ != TAO_RS_INITIALIZED) { - ACE_THROW (CORBA::BAD_INV_ORDER ( + throw ( ::CORBA::BAD_INV_ORDER ( CORBA::SystemException::_tao_minor_code ( TAO_AMH_REPLY_LOCATION_CODE, ENOTSUP), @@ -181,13 +177,13 @@ TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL) void TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex - ACE_ENV_ARG_DECL) + ) { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); if (this->reply_status_ != TAO_RS_UNINITIALIZED) { - ACE_THROW (CORBA::BAD_INV_ORDER ( + throw ( ::CORBA::BAD_INV_ORDER ( CORBA::SystemException::_tao_minor_code ( TAO_AMH_REPLY_LOCATION_CODE, ENOTSUP), @@ -212,7 +208,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex reply_params, ex) == -1) { - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } // Send the Exception |