diff options
Diffstat (limited to 'TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp')
| -rw-r--r-- | TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp index 500e72adc88..1213d69c276 100644 --- a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp +++ b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp @@ -49,15 +49,13 @@ main (int argc, char *argv[]) argv) == -1) return -1; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { 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, @@ -79,8 +77,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 (), @@ -95,10 +92,9 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions.. } - ACE_ENDTRY; return 0; } |