diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp')
-rw-r--r-- | TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp index 07b0cf172c3..c86941f3e92 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp @@ -20,16 +20,16 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + sorb_->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -40,15 +40,15 @@ Server_Task::svc (void) ACE_NEW_RETURN (server_impl, TestImpl (sorb_.in ()), 1); PortableServer::ObjectId_var id = - root_poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (server_impl); CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); - Test_var server = Test::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); + Test_var server = Test::_narrow (test_obj.in ()); CORBA::String_var ior = - sorb_->object_to_string (test_obj.in () ACE_ENV_ARG_PARAMETER); + sorb_->object_to_string (test_obj.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (output_, "w"); @@ -67,15 +67,13 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in server task:"); + ex._tao_print_exception ("Exception caught in server task:"); return 1; } - ACE_ENDTRY; return 0; } |