1 files changed, 12 insertions, 21 deletions

diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
index 1bb6f2cbc19..978df100a3e 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
@@ -75,11 +75,10 @@ AMH_Servant::parse_args (int &argc, char **argv)
 
 void
 AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                          Test::Timestamp send_time
-                          ACE_ENV_ARG_DECL)
+                          Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       // @@ Mayur, the below Timer_Handler instance will leak if your
       //    schedule_timer() call below fails (which you do not check
@@ -96,7 +95,6 @@ AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
       long l = this->reactor_->schedule_timer (handler,
                                                (void *) 0,
                                                ACE_Time_Value (0, this->sleep_time_));
-      ACE_TRY_CHECK;
 
       if (l == -1) //schedule timer failed
         {
@@ -110,11 +108,10 @@ AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
           return;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Exception in start_test \n");
+      ex._tao_print_exception ("Exception in start_test \n");
     }
-  ACE_ENDTRY;
 
   // Footnote: This method is thread-safe:
   // - We have no common state (and don't alter any).
@@ -123,37 +120,31 @@ AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 }
 
 void
-AMH_Servant::start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-                         ACE_ENV_ARG_DECL)
+AMH_Servant::start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       _tao_rh->start_test ();
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Exception in start_test \n");
+      ex._tao_print_exception ("Exception in start_test \n");
     }
-  ACE_ENDTRY;
 }
 
 void
-AMH_Servant::end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-                         ACE_ENV_ARG_DECL)
+AMH_Servant::end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       _tao_rh->end_test ();
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Exception in end_test \n");
+      ex._tao_print_exception ("Exception in end_test \n");
     }
-  ACE_ENDTRY;
 }