1 files changed, 17 insertions, 31 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
index 8eba0d841ef..b6b936da109 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
@@ -44,8 +44,7 @@ namespace TAO_Notify
 
   NotifyExt::ReconnectionRegistry::ReconnectionID
   Reconnection_Registry::register_callback (
-    NotifyExt::ReconnectionCallback_ptr callback
-    ACE_ENV_ARG_DECL)
+    NotifyExt::ReconnectionCallback_ptr callback)
   {
     //@@todo DO WE NEED THREAD SAFENESS?
     NotifyExt::ReconnectionRegistry::ReconnectionID next_id = ++highest_id_;
@@ -60,22 +59,19 @@ namespace TAO_Notify
     TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
     CORBA::ORB_var orb = properties->orb ();
 
-    CORBA::String_var cior = orb->object_to_string (callback ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    CORBA::String_var cior = orb->object_to_string (callback);
     ACE_CString ior(cior.in ());
     if ( 0 != reconnection_registry_.bind (next_id, ior))
     {
       //todo throw something;
     }
-    this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    this->self_change ();
 
     return next_id;
   }
 
   void
-  Reconnection_Registry::unregister_callback (NotifyExt::ReconnectionRegistry::ReconnectionID id
-    ACE_ENV_ARG_DECL)
+  Reconnection_Registry::unregister_callback (NotifyExt::ReconnectionRegistry::ReconnectionID id)
   {
     if (DEBUG_LEVEL > 0)
     {
@@ -88,12 +84,11 @@ namespace TAO_Notify
     {
       //@@todo  throw something
     }
-    this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    this->self_change ();
   }
 
   CORBA::Boolean
-  Reconnection_Registry::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Reconnection_Registry::is_alive (void)
   {
     return CORBA::Boolean(1);
   }
@@ -102,7 +97,7 @@ namespace TAO_Notify
   // During topology save
 
   void
-  Reconnection_Registry::save_persistent (Topology_Saver& saver ACE_ENV_ARG_DECL)
+  Reconnection_Registry::save_persistent (Topology_Saver& saver)
   {
     bool change = this->self_changed_;
     this->self_changed_ = false;
@@ -110,8 +105,7 @@ namespace TAO_Notify
 
     NVPList attrs;
     //@@todo: bool want_all_children =
-      saver.begin_object (0, REGISTRY_TYPE, attrs, change ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      saver.begin_object (0, REGISTRY_TYPE, attrs, change);
 
     Reconnection_Registry_Type::ENTRY *entry;
     for (Reconnection_Registry_Type::ITERATOR iter (this->reconnection_registry_);
@@ -128,17 +122,15 @@ namespace TAO_Notify
       }
       cattrs.push_back(NVP(RECONNECT_ID, entry->ext_id_));
       cattrs.push_back(NVP(RECONNECT_IOR, entry->int_id_));
-      saver.begin_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE, cattrs, true ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-      saver.end_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      saver.begin_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE, cattrs, true);
+      saver.end_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE);
     }
 // todo:
 //    for all deleted children
 //    {
 //      saver.delete_child(child_type, child_id);
 //    }
-    saver.end_object (0, REGISTRY_TYPE ACE_ENV_ARG_PARAMETER);
+    saver.end_object (0, REGISTRY_TYPE);
   }
 
   ///////////////////////////////////////
@@ -147,8 +139,7 @@ namespace TAO_Notify
   Topology_Object*
   Reconnection_Registry::load_child (const ACE_CString & type,
         CORBA::Long,
-        const NVPList& attrs
-        ACE_ENV_ARG_DECL_NOT_USED)
+        const NVPList& attrs)
   {
     if (type == REGISTRY_CALLBACK_TYPE)
     {
@@ -184,8 +175,7 @@ namespace TAO_Notify
   }
 
   void
-  Reconnection_Registry::send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-    ACE_ENV_ARG_DECL_NOT_USED)
+  Reconnection_Registry::send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
   {
     TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
     CORBA::ORB_var orb = properties->orb ();
@@ -196,8 +186,7 @@ namespace TAO_Notify
       iter.next (entry);
       iter.advance ())
     {
-      ACE_DECLARE_NEW_ENV;
-      ACE_TRY
+      try
       {
         if (DEBUG_LEVEL > 0)
         {
@@ -207,14 +196,12 @@ namespace TAO_Notify
             ));
         }
         ACE_CString & ior = entry->int_id_;
-        CORBA::Object_var obj = orb->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::Object_var obj = orb->string_to_object (ior.c_str ());
         NotifyExt::ReconnectionCallback_var callback =
           NotifyExt::ReconnectionCallback::_narrow (obj.in ());
         if (!CORBA::is_nil (callback.in ()))
         {
-          callback->reconnect (dest_factory ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          callback->reconnect (dest_factory);
         }
         else
         {
@@ -227,7 +214,7 @@ namespace TAO_Notify
           bad_ids.push_back (entry->ext_id_);
         }
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
       {
         ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT ("(%P|%t) Reconnection Registry: Exception sending reconnection to client -- discarding registry entry\n")
@@ -236,7 +223,6 @@ namespace TAO_Notify
         bad_ids.push_back (entry->ext_id_);
         //@@todo : we might want to check for retryable exceptions, but for now...
       }
-      ACE_ENDTRY;
     }
     size_t bad_count = bad_ids.size ();
     for (size_t nbad = 0; nbad < bad_count; ++nbad)