1 files changed, 19 insertions, 39 deletions

diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
index c3d906faeb3..c0358e99f27 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
@@ -40,29 +40,23 @@ parse_args (int argc, char *argv[])
 }
 
 void
-run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL)
+run_test (Test_Interceptors::Visual_ptr server)
 {
   CORBA::String_var msg;
 
   server->normal (10,
-                  msg.out ()
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                  msg.out ());
 
   CORBA::Long one = 1, two = 1, result = 0;
   result = server->calculate (one,
-                              two
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              two);
 
   ACE_DEBUG ((LM_DEBUG,
               "calculate() result = %d\n",
               result));
 
   Test_Interceptors::Visual::VarLenStruct_var v =
-    server->the_structure (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    server->the_structure ();
 
   ACE_DEBUG ((LM_DEBUG,
               "the_structure() result is:\n"
@@ -71,35 +65,29 @@ run_test (Test_Interceptors::Visual_ptr server
               v->flag,
               v->message.in ()));
 
-  ACE_TRY
+  try
     {
-      server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      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;
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 #if TAO_HAS_INTERCEPTORS == 1
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
@@ -111,25 +99,20 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       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 ()))
         {
@@ -139,18 +122,15 @@ main (int argc, char *argv[])
                             1);
         }
 
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
+      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,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }