diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp')
-rw-r--r-- | TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp | 44 |
1 files changed, 14 insertions, 30 deletions
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp index 000fda92d76..8c92a58148a 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp @@ -41,8 +41,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { bool destroy_called = false; @@ -54,18 +53,14 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ORB_init (argc, argv, "Server ORB"); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -73,15 +68,12 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (::parse_args (argc, argv) != 0) return -1; @@ -89,13 +81,10 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); CORBA::Object_var obj = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = - orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "test servant: <%s>\n", @@ -113,26 +102,21 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->destroy (1, 1); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_ASSERT (destroy_called == true); ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; return 0; } |