diff options
Diffstat (limited to 'TAO/tests/Bug_2429_Regression/server.cpp')
| -rw-r--r-- | TAO/tests/Bug_2429_Regression/server.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp index 8111a41efbb..5658bcbaed4 100644 --- a/TAO/tests/Bug_2429_Regression/server.cpp +++ b/TAO/tests/Bug_2429_Regression/server.cpp @@ -34,21 +34,18 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + 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 ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -62,8 +59,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); if (output_file == 0) @@ -81,16 +77,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } |