diff options
Diffstat (limited to 'TAO/tests/Collocation_Exception_Test/Server_Task.cpp')
| -rw-r--r-- | TAO/tests/Collocation_Exception_Test/Server_Task.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp index 746c3ff7758..8129e39ffc9 100644 --- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp @@ -31,12 +31,10 @@ Server_Task::svc (void) CORBA::Object_var poa_object = this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -44,8 +42,7 @@ Server_Task::svc (void) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Hello *hello_impl; ACE_NEW_RETURN (hello_impl, @@ -56,13 +53,11 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = this->sorb_->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -76,22 +71,18 @@ Server_Task::svc (void) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->destroy (); } ACE_CATCHANY { |