1 files changed, 8 insertions, 13 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index 01a7a51711f..df5b3989df0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -38,7 +38,7 @@ TAO_Notify_ThreadPool_Task::timer (void)
 
 void
 TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
-                                  const TAO_Notify_AdminProperties::Ptr& admin_properties  ACE_ENV_ARG_DECL)
+                                  const TAO_Notify_AdminProperties::Ptr& admin_properties)
 {
   ACE_ASSERT (this->timer_.get() == 0);
 
@@ -46,7 +46,6 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
   ACE_NEW_THROW_EX (timer,
     TAO_Notify_Timer_Queue (),
     CORBA::NO_MEMORY ());
-  ACE_CHECK;
   this->timer_.reset (timer);
 
 
@@ -55,7 +54,6 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
     TAO_Notify_Buffering_Strategy (*msg_queue (), admin_properties),
     CORBA::NO_MEMORY ());
   this->buffering_strategy_.reset (buffering_strategy);
-  ACE_CHECK;
 
   long flags = THR_NEW_LWP | THR_DETACHED;
   CORBA::ORB_var orb =
@@ -94,17 +92,16 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
         ACE_TEXT ("exiting!\n%a"),
         tp_params.default_priority));
     }
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
   }
 }
 
 void
-TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL)
+TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request)
 {
   if (!shutdown_)
   {
-    TAO_Notify_Method_Request_Queueable* request_copy = method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    TAO_Notify_Method_Request_Queueable* request_copy = method_request.copy ();
 
     if (this->buffering_strategy_->enqueue (request_copy) == -1)
     {
@@ -122,7 +119,7 @@ TAO_Notify_ThreadPool_Task::svc (void)
 
   while (!shutdown_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       ACE_Time_Value* dequeue_blocking_time = 0;
       ACE_Time_Value earliest_time;
@@ -138,8 +135,7 @@ TAO_Notify_ThreadPool_Task::svc (void)
 
       if (result > 0)
       {
-        method_request->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        method_request->execute ();
 
         ACE_Message_Block::release (method_request);
       }
@@ -153,12 +149,11 @@ TAO_Notify_ThreadPool_Task::svc (void)
           ACE_DEBUG ((LM_DEBUG, "ThreadPool_Task dequeue failed\n"));
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ex._tao_print_exception (
         "ThreadPool_Task (%P|%t) exception in method request\n");
     }
-    ACE_ENDTRY;
   } /* while */
 
   return 0;