diff options
Diffstat (limited to 'TAO/tests/AMH_Exceptions')
| -rw-r--r-- | TAO/tests/AMH_Exceptions/client.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/AMH_Exceptions/server.cpp | 20 |
2 files changed, 4 insertions, 20 deletions
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp index 60dbc3e8da3..34ffc46f424 100644 --- a/TAO/tests/AMH_Exceptions/client.cpp +++ b/TAO/tests/AMH_Exceptions/client.cpp @@ -12,15 +12,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (roundtrip.in ())) { @@ -33,7 +30,6 @@ main (int argc, char *argv[]) ACE_TRY { Test::Timestamp time = 10; roundtrip->test_method (time ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH(Test::ServerOverload, ov) { diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index 4bc543e5537..0a124577673 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -51,7 +51,6 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, ACE_TRY { _tao_rh->test_method_excep (&holder ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL {} @@ -120,10 +119,8 @@ ST_AMH_Server::~ST_AMH_Server () ACE_TRY_NEW_ENV { this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } ACE_CATCHANY { @@ -141,11 +138,9 @@ ST_AMH_Server::start_orb_and_poa (void) this->orb_ = CORBA::ORB_init (*(this->argc_), this->argv_, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -154,14 +149,11 @@ ST_AMH_Server::start_orb_and_poa (void) this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); } ACE_CATCHANY { @@ -179,12 +171,10 @@ ST_AMH_Server::register_servant (ST_AMH_Servant *servant) ACE_TRY_NEW_ENV { Test::Roundtrip_var roundtrip = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant->_this (); CORBA::String_var ior = this->orb_->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; (void) this->write_ior_to_file (ior); } @@ -205,9 +195,7 @@ ST_AMH_Server::run_event_loop () while (!this->orb_->orb_core ()->has_shutdown ()) { this->orb_->perform_work (&period); - ACE_TRY_CHECK; } - ACE_TRY_CHECK; } ACE_CATCHANY {} |