diff options
Diffstat (limited to 'TAO/tests/Hang_Shutdown/server.cpp')
| -rw-r--r-- | TAO/tests/Hang_Shutdown/server.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp index 259e33b46c6..8484dce2280 100644 --- a/TAO/tests/Hang_Shutdown/server.cpp +++ b/TAO/tests/Hang_Shutdown/server.cpp @@ -12,23 +12,19 @@ namespace Test try_main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -48,8 +44,7 @@ namespace Test test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -71,18 +66,15 @@ namespace Test "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught CORBA exception \n"); + ex._tao_print_exception ("Caught CORBA exception \n"); return -1; } - ACE_ENDTRY; return 0; } |