1 files changed, 8 insertions, 10 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index 6d71dcb8fbb..81c43a8ff53 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -38,7 +38,7 @@ TAO_Notify_StructuredProxyPushSupplier::MyType (void)
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -51,9 +51,9 @@ TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNot
                     TAO_Notify_StructuredPushConsumer (this),
                     CORBA::NO_MEMORY ());
 
-  consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
+  consumer->init (push_consumer);
 
-  this->connect (consumer ACE_ENV_ARG_PARAMETER);
+  this->connect (consumer);
   this->self_change ();
 }
 
@@ -83,22 +83,20 @@ TAO_Notify_StructuredProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& a
   if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
     {
       CosNotifyComm::StructuredPushConsumer_var pc = CosNotifyComm::StructuredPushConsumer::_nil();
       if (ior.length() > 0)
       {
-        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-        pc = CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str());
+        pc = CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in());
       }
-      this->connect_structured_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
+      this->connect_structured_push_consumer(pc.in());
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       // if we can't connect... tough
     }
-    ACE_ENDTRY;
   }
 }