1 files changed, 16 insertions, 32 deletions

diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
index aa829e678f1..a26f61237ab 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
@@ -21,16 +21,14 @@ Client_Task::Client_Task (const char *ior,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       CORBA::Object_var object =
-        corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        corb_->string_to_object (input_);
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -40,19 +38,15 @@ Client_Task::svc (void)
                             1);
         }
 
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (server.in ());
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client task:");
+      ex._tao_print_exception ("Exception caught in client task:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
@@ -60,39 +54,29 @@ Client_Task::svc (void)
 
 
 void
-Client_Task::run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL)
+Client_Task::run_test (Test_Interceptors::Visual_ptr server)
 {
-  server->normal (10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  server->normal (10);
 
   CORBA::Long one = 1, two = 1;
   (void) server->calculate (one,
-                            two
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                            two);
 
-  ACE_TRY
+  try
     {
-      (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      (void) server->user ();
     }
-  ACE_CATCH (Test_Interceptors::Silly, userex)
+  catch (const Test_Interceptors::Silly&)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught Silly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
-  ACE_TRY_EX (SYS)
+  try
     {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SYS);
+      server->system ();
     }
-  ACE_CATCH (CORBA::INV_OBJREF, sysex)
+  catch (const CORBA::INV_OBJREF&)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }