diff options
Diffstat (limited to 'TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp')
| -rw-r--r-- | TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp index 3e2bab6c3fc..603fa6b822d 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp @@ -60,16 +60,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); - ACE_TRY_CHECK; + server_orb.c_str ()); ACE_Manual_Event me; Server_Task server_task (output, @@ -92,9 +89,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); - ACE_TRY_CHECK; + client_orb.c_str ()); Client_Task client_task (input, simple_test_input, @@ -112,12 +107,10 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); // Now that all threads have completed we can destroy the ORB - sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sorb->destroy (); if (server_orb != client_orb) { - corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + corb->destroy (); } CORBA::ULong errors = client_task.error_count () + server_task.error_count (); @@ -131,10 +124,9 @@ main (int argc, char *argv[]) return 1; } } - ACE_CATCHANY + catch (const CORBA::Exception&) { // Ignore exceptions.. } - ACE_ENDTRY; return 0; } |