1 files changed, 6 insertions, 12 deletions

diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index b2aea30f498..4dfd9eee2dc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -178,19 +178,18 @@ TAO_Notify_Tests_Periodic_Supplier::activate_task (ACE_Barrier* barrier)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (void)
 {
   int WARMUP_COUNT = 10;
 
   for (int i = 0; i < WARMUP_COUNT ; ++i)
     {
       this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::send_prologue (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier::send_prologue (void)
 {
   // populate event.
   // send the base time and max count.
@@ -212,14 +211,12 @@ TAO_Notify_Tests_Periodic_Supplier::send_prologue (ACE_ENV_SINGLE_ARG_DECL)
     ACE_DEBUG ((LM_DEBUG, "(%P, %t) Supplier (%s) sending event 0th event\n"));
 
   this->send_event (zeroth_event.event () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::handle_svc (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier::handle_svc (void)
 {
-  this->send_prologue (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->send_prologue ();
 
   ACE_hrtime_t before, after;
   TimeBase::TimeT time_t;
@@ -254,7 +251,6 @@ TAO_Notify_Tests_Periodic_Supplier::handle_svc (ACE_ENV_SINGLE_ARG_DECL)
                     this->name_.c_str (), i));
 
       this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       after = ACE_OS::gethrtime ();
 
@@ -309,8 +305,7 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void)
   ACE_TRY_NEW_ENV
     {
       // First, send warmup events.
-      this->send_warmup_events (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->send_warmup_events ();
 
       // Next, wait for other threads.
       this->barrier_->wait ();
@@ -321,8 +316,7 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void)
       // now wait till the phase_ period expires.
       ACE_OS::sleep (ACE_Time_Value (0, phase_));
 
-      this->handle_svc (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->handle_svc ();
     }
   ACE_CATCH (CORBA::UserException, ue)
     {