diff options
Diffstat (limited to 'TAO/tests/Bug_1482_Regression/Reply_Handler.cpp')
| -rw-r--r-- | TAO/tests/Bug_1482_Regression/Reply_Handler.cpp | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp index 93189526614..cac4a472529 100644 --- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp +++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp @@ -7,8 +7,7 @@ Reply_Handler::Reply_Handler (CORBA::ORB_ptr o) } void -Reply_Handler::next_prime (CORBA::ULong - ACE_ENV_ARG_DECL_NOT_USED) +Reply_Handler::next_prime (CORBA::ULong) ACE_THROW_SPEC ((CORBA::SystemException)) { return; @@ -16,34 +15,27 @@ Reply_Handler::next_prime (CORBA::ULong void Reply_Handler::next_prime_excep ( - ::Messaging::ExceptionHolder *ex - ACE_ENV_ARG_DECL) + ::Messaging::ExceptionHolder *ex) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { - ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ex->raise_exception (); } - ACE_CATCH (CORBA::COMM_FAILURE, t) + catch (const CORBA::COMM_FAILURE& ) { /*ACE_DEBUG ((LM_DEBUG, "Callback method <next_prime_excep> called: \n")); */ ACE_Time_Value tv (10, 0); - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (tv); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->shutdown (0); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } - ACE_ENDTRY; - ACE_CHECK; } |