diff options
Diffstat (limited to 'TAO/tests/AMI_Timeouts/server.cpp')
-rw-r--r-- | TAO/tests/AMI_Timeouts/server.cpp | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp index b26f765296d..56245f32862 100644 --- a/TAO/tests/AMI_Timeouts/server.cpp +++ b/TAO/tests/AMI_Timeouts/server.cpp @@ -54,16 +54,13 @@ parse_args (int argc, char *argv[]) int 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); - ACE_TRY_CHECK; + CORBA::ORB_init (argc, argv, ""); 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, @@ -71,12 +68,10 @@ 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 (); if (parse_args (argc, argv) != 0) return 1; @@ -84,12 +79,10 @@ main (int argc, char *argv[]) Timeout_i timeout_i (orb.in ()); TimeoutObj_var timeout_var = - timeout_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + timeout_i._this (); CORBA::String_var ior = - orb->object_to_string (timeout_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->object_to_string (timeout_var.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -106,15 +99,13 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Instantiate reply handler TimeoutHandler_i timeoutHandler_i; AMI_TimeoutObjHandler_var timeoutHandler_var = - timeoutHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + timeoutHandler_i._this (); // Instantiate client /* @@ -126,29 +117,24 @@ main (int argc, char *argv[]) client->activate (); */ - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, // ethernalize objects 0 // wait for completion - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); //delete client; } - 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; } |