1 files changed, 30 insertions, 59 deletions

diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 420b6d15b95..9d0e2bcea31 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -40,21 +40,18 @@ public:
   {
   }
 
-  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void run_test (void) = 0;
 
   virtual int svc (void)
   {
     this->the_barrier_->wait ();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
-        this->run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->run_test ();
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
       {
       }
-    ACE_ENDTRY;
 
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) done...\n"));
     return 0;
@@ -81,18 +78,15 @@ public:
   {
   }
 
-  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void run_test (void)
   {
     Test::Callback_var cb =
-      callback->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      callback->_this ();
 
     Implicit_Deactivator deactivator (callback);
 
     Test::Session_var session =
-      this->session_factory_->create_new_session (cb.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->session_factory_->create_new_session (cb.in ());
 
     ACE_Utils::Auto_Functor<Test::Session,Shutdown<Test::Session> > auto_shutdown (session.in ());
 
@@ -108,13 +102,11 @@ public:
         ACE_Time_Value period (0, this->period_in_usecs_);
         ACE_OS::sleep (period);
 
-        ACE_TRY {
+        try{
           ACE_hrtime_t start = ACE_OS::gethrtime ();
-          (void) session->sample (start
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        } ACE_CATCHANY {
-        } ACE_ENDTRY;
+          (void) session->sample (start);
+        } catch (const CORBA::Exception&) {
+        }
       }
   }
 
@@ -146,18 +138,15 @@ public:
     this->stopped_ = 1;
   }
 
-  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void run_test (void)
   {
     Test::Callback_var cb =
-      callback->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      callback->_this ();
 
     Implicit_Deactivator deactivator (callback);
 
     Test::Session_var session =
-      this->session_factory_->create_new_session (cb.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->session_factory_->create_new_session (cb.in ());
 
     ACE_Utils::Auto_Functor<Test::Session,Shutdown<Test::Session> > auto_shutdown (session.in ());
 
@@ -172,14 +161,12 @@ public:
             return;
         }
 
-        ACE_TRY {
+        try{
           CORBA::ULongLong dummy = 0;
-          (void) session->sample (dummy
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) session->sample (dummy);
 
-        } ACE_CATCHANY {
-        } ACE_ENDTRY;
+        } catch (const CORBA::Exception&) {
+        }
       }
   }
 
@@ -198,11 +185,9 @@ int main (int argc, char *argv[])
   /// Move the test to the real-time class if it is possible.
   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)
@@ -226,22 +211,16 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (options.use_rt_corba,
                                      orb,
                                      rt_class,
-                                     options.nthreads
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     options.nthreads);
 
       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 ());
 
@@ -254,18 +233,13 @@ 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);
 
       Test::Session_Factory_var session_factory =
-        Test::Session_Factory::_narrow (object.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Session_Factory::_narrow (object.in ());
 
       CORBA::PolicyList_var inconsistent_policies;
-      (void) session_factory->_validate_connection (inconsistent_policies
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      (void) session_factory->_validate_connection (inconsistent_policies);
 
       int thread_count = 1 + options.nthreads;
       ACE_Barrier the_barrier (thread_count);
@@ -318,18 +292,15 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - all task(s) joined\n"));
 
-      session_factory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      session_factory->shutdown ();
 
       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;
 }