1 files changed, 14 insertions, 26 deletions

diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
index c6f274953fe..aa2959f4104 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
@@ -15,35 +15,29 @@ Reply_Handler::Reply_Handler (
 }
 
 void
-Reply_Handler::short_sleep (ACE_ENV_SINGLE_ARG_DECL)
+Reply_Handler::short_sleep (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  check_counter(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  check_counter();
 
   Test::AMI_HelloHandler_var current =
-    _this(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    _this();
 
-  hello_->sendc_short_sleep(current.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  hello_->sendc_short_sleep(current.in());
 }
 
 void
 Reply_Handler::short_sleep_excep (
-    ::Messaging::ExceptionHolder *ex
-    ACE_ENV_ARG_DECL)
+    ::Messaging::ExceptionHolder *ex)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  check_counter(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  check_counter();
 
-  ACE_TRY
+  try
     {
       if (ex)
         {
-          ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ex->raise_exception ();
         }
       else
         {
@@ -53,34 +47,28 @@ Reply_Handler::short_sleep_excep (
           ACE_ERROR ((LM_ERROR, "ERROR: Got nill exceptionholder\n"));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Exceptions are expected and thus ignored in normal runs:
 #if 0
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Reply_Handler - caught exception:");
+      ex._tao_print_exception ("(%P|%t) Reply_Handler - caught exception:");
 #endif /* 0 */
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   Test::AMI_HelloHandler_var current =
-    _this(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    _this();
 
-  hello_->sendc_short_sleep(current.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  hello_->sendc_short_sleep(current.in());
 }
 
 void Reply_Handler::
-check_counter(ACE_ENV_SINGLE_ARG_DECL)
+check_counter(void)
 {
   long const count = --counter_;
   if(count == 0)
   {
     // ACE_DEBUG((LM_DEBUG, "(%P|%t) Shut down client thread\n"));
-    orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    orb_->shutdown(0);
     return;
   }
 #if 0