Wed Jan 24 12:25:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 6 insertions, 8 deletions

diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
index e1602e2dde3..3cc1e6c5a38 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
@@ -14,19 +14,17 @@ ACE_INLINE
 TAO::CSD::TP_Cancel_Visitor::TP_Cancel_Visitor(PortableServer::Servant servant)
   : servant_(servant)
 {
-  // This try-catch block is not really necessary for current implementation 
-  // since the _add_ref does not throw exception, but we have to add it to 
-  // satisfy the non-exception builds. If _add_ref really throws an exception 
+  // This try-catch block is not really necessary for current implementation
+  // since the _add_ref does not throw exception, but we have to add it to
+  // satisfy the non-exception builds. If _add_ref really throws an exception
   // then this constructor needs deal with the exception.
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->servant_->_add_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL