1 files changed, 11 insertions, 21 deletions

diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp
index 92c312ef9df..6a904e446f2 100644
--- a/TAO/performance-tests/Throughput/client.cpp
+++ b/TAO/performance-tests/Throughput/client.cpp
@@ -61,22 +61,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_Factory_var receiver_factory =
-        Test::Receiver_Factory::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Receiver_Factory::_narrow(tmp.in ());
 
       if (CORBA::is_nil (receiver_factory.in ()))
         {
@@ -100,19 +97,16 @@ main (int argc, char *argv[])
           message.the_payload.length (message_size);
 
           Test::Receiver_var receiver =
-            receiver_factory->create_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            receiver_factory->create_receiver ();
 
           ACE_hrtime_t start = ACE_OS::gethrtime ();
           for (int i = 0; i != message_count; ++i)
             {
               message.message_id = i;
-              receiver->receive_data (message ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              receiver->receive_data (message);
             }
 
-          receiver->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          receiver->done ();
           ACE_hrtime_t elapsed_time = ACE_OS::gethrtime () - start;
 
           // convert to microseconds
@@ -140,20 +134,16 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          receiver_factory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          receiver_factory->shutdown ();
         }
 
-      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;
 }