1 files changed, 14 insertions, 33 deletions

diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
index 5e723b3cca5..bd774077776 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
@@ -35,11 +35,9 @@ int main (int argc, char *argv[])
 
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ORB_Holder orb (argc, argv, "");
 
       Client_Options options (argc, argv);
       if (argc != 1)
@@ -64,21 +62,16 @@ int main (int argc, char *argv[])
                                      orb,
                                      rt_class,
                                      1 // options.nthreads
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     );
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       PortableServer::POA_var the_poa (rtserver_setup.poa ());
 
@@ -94,20 +87,15 @@ int main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
 
       CORBA::Object_var object =
-        orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (options.ior);
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ());
 
       EC_Destroyer ec_destroyer (ec.in ());
 
       CORBA::PolicyList_var inconsistent_policies;
-      (void) ec->_validate_connection (inconsistent_policies
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      (void) ec->_validate_connection (inconsistent_policies);
 
       ACE_DEBUG ((LM_DEBUG, "Found EC, validated connection\n"));
 
@@ -144,9 +132,7 @@ int main (int argc, char *argv[])
 
       if (!options.high_priority_is_last)
         {
-          high_priority_group.connect (ec.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          high_priority_group.connect (ec.in ());
           high_priority_disconnect = &high_priority_group;
         }
 
@@ -169,14 +155,11 @@ int main (int argc, char *argv[])
           the_poa.in (),
           the_poa.in (),
           ec.in (),
-          &the_barrier
-          ACE_ENV_ARG_PARAMETER);
+          &the_barrier);
 
       if (options.high_priority_is_last)
         {
-          high_priority_group.connect (ec.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          high_priority_group.connect (ec.in ());
           high_priority_disconnect = &high_priority_group;
         }
       Send_Task high_priority_task;
@@ -219,13 +202,11 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n"));
     }
-  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;
 }