diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp')
| -rw-r--r-- | TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp index fd0619dcc12..de4e62710e2 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp @@ -61,8 +61,7 @@ main (int argc, char *argv[]) server_orb.set ("server_orb"); client_orb.set ("client_orb"); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr temp_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -132,15 +131,13 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = CORBA::ORB_init (satc.get_argc (), satc.get_TCHAR_argv (), - server_orb.c_str () - ACE_ENV_ARG_PARAMETER); + server_orb.c_str ()); ACE_Manual_Event me; Server_Task server_task (output, @@ -162,8 +159,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (catc.get_argc (), catc.get_TCHAR_argv (), - client_orb.c_str () - ACE_ENV_ARG_PARAMETER); + client_orb.c_str ()); Client_Task client_task (input, corb.in (), @@ -211,12 +207,11 @@ main (int argc, char *argv[]) return 1; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Some exception was caught in main().\n")); return 1; } - ACE_ENDTRY; return 0; } |