1 files changed, 12 insertions, 19 deletions

diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index e149b323d49..e436d187fa6 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -40,22 +40,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       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 tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Receiver_var receiver =
-        Test::Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Receiver::_narrow(tmp.in ());
 
       if (CORBA::is_nil (receiver.in ()))
         {
@@ -71,7 +68,7 @@ main (int argc, char *argv[])
         }
       else
         {
-        
+
           Client_Task client_task (receiver.in (),
 #if defined (ACE_OPENVMS)
                                   750, /* test takes much longer on OpenVMS */
@@ -80,29 +77,25 @@ main (int argc, char *argv[])
 #endif
                                   32768,
                                   ACE_Thread_Manager::instance ());
-        
+
           if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1)
               {
               ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
               }
           ACE_Thread_Manager::instance ()->wait ();
-        
-          CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        
+
+          CORBA::Long count = receiver->get_event_count ();
+
           ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n",
                       count));
         }
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }