diff options
Diffstat (limited to 'TAO/tests/Collocation_Exception_Test/Server_Task.cpp')
-rw-r--r-- | TAO/tests/Collocation_Exception_Test/Server_Task.cpp | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp index 746c3ff7758..c6e578fa422 100644 --- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp @@ -26,17 +26,13 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - this->sorb_->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -44,8 +40,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 +51,10 @@ 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; + this->sorb_->object_to_string (hello.in ()); // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -76,30 +68,24 @@ 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; + root_poa->destroy (1, 1); - this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } |