1 files changed, 10 insertions, 14 deletions

diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index 5ea8f3bc1b6..dca8d5da939 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -37,11 +37,11 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
   TAO_ESF_RefCountedRef<PROXY> holder (proxy);
 
   ACE_TYPENAME PROXY::_ptr_type r;
-  proxy->activate (r ACE_ENV_ARG_PARAMETER);
+  proxy->activate (r);
 
   ACE_TYPENAME PROXY::_var_type result = r;
 
-  this->collection_->connected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_->connected (proxy);
 
   return result._retn ();
 }
@@ -53,7 +53,7 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 {
   TAO_ESF_Shutdown_Proxy<PROXY> worker;
 
-  this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER);
+  this->collection_->for_each (&worker);
 // Cannot happen, just following the discipline.
 
   this->collection_->shutdown ();
@@ -61,35 +61,32 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    connected (PROXY *
-               ACE_ENV_ARG_DECL_NOT_USED)
+    connected (PROXY *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    reconnected (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected (PROXY *proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->collection_->reconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_->reconnected (proxy);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    disconnected (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected (PROXY *proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   proxy->deactivate ();
 // Cannot happen, just following the discipline.
 
-  ACE_TRY
+  try
     {
-      this->collection_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
+      this->collection_->disconnected (proxy);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // @@ In the future the collections may raise exceptions to
       // report errors (such as out of memory or things like that).
@@ -99,7 +96,6 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
       // resources" or something similar, and i've never seen a spec
       // that has an exception for "could not acquire a mutex".
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL