diff options
Diffstat (limited to 'TAO/orbsvcs/tests/HTIOP/AMI/server.cpp')
-rw-r--r-- | TAO/orbsvcs/tests/HTIOP/AMI/server.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp index 2518bebee9b..05bfe8816c1 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp @@ -61,14 +61,13 @@ int main (int argc, char *argv[]) { ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_server")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -76,7 +75,7 @@ main (int argc, char *argv[]) 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 (); @@ -92,7 +91,7 @@ main (int argc, char *argv[]) ami_test_i._this (); CORBA::String_var ior = - orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (ami_test_var.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -115,19 +114,17 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion - ACE_ENV_ARG_PARAMETER); + ); orb->destroy (); 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; ACE_END_TEST; return 0; |