ChangeLogTag: Tue Dec 30 17:46:45 2003 Dale Wilson <wilson_d@ociweb.com>

4 files changed, 87 insertions, 22 deletions

diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index 0467dfde29e..5d59b163372 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -102,7 +102,7 @@ int TAO::FT_FaultConsumer::init (
   // Subscribe to the FaultNotifier.
   CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_nil ();
   this->consumer_id_ = fault_notifier_->connect_structured_fault_consumer (
-    this->consumer_ref_.in(), filter ACE_ENV_ARG_PARAMETER);
+    this->consumer_ref_.in(), filter.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (TAO_debug_level > 1)
@@ -204,7 +204,7 @@ CosNotifyComm::StructuredPushConsumer_ptr
 TAO::FT_FaultConsumer::consumer_ref ()
 {
   return CosNotifyComm::StructuredPushConsumer::_duplicate (
-      this->consumer_ref_);
+      this->consumer_ref_.in ());
 }
 
 size_t TAO::FT_FaultConsumer::notifications () const
@@ -222,7 +222,7 @@ size_t TAO::FT_FaultConsumer::notifications () const
 // we simply log the error and drop the event.
 void TAO::FT_FaultConsumer::push_structured_event (
   const CosNotification::StructuredEvent &event
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
+  ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected))
 {
@@ -274,17 +274,19 @@ void TAO::FT_FaultConsumer::push_structured_event (
 void TAO::FT_FaultConsumer::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType))
 {
+  ACE_UNUSED_ARG (added);
+  ACE_UNUSED_ARG (removed);
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT("TAO::FT_FaultConsumer::offer_change() call ignored.\n")
   ));
 }
 
 void TAO::FT_FaultConsumer::disconnect_structured_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index b2f4e4ee732..2ff4fa0f1f1 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -214,9 +214,9 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Activate the RootPOA.
   PortableServer::POAManager_var poa_mgr =
-    this->poa_->the_POAManager (ACE_ENV_ARG_PARAMETER);
+    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  poa_mgr->activate (ACE_ENV_ARG_PARAMETER);
+  poa_mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register our IOR in the IORTable with the key-string
@@ -350,7 +350,7 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 }
 
 //public
-int TAO::FT_ReplicationManager::idle (int & result)
+int TAO::FT_ReplicationManager::idle (int & result ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_UNUSED_ARG (result);
   return this->quit_;
@@ -499,7 +499,7 @@ TAO::FT_ReplicationManager::get_fault_notifier (
 ::PortableGroup::FactoryRegistry_ptr
 TAO::FT_ReplicationManager::get_factory_registry (
   const PortableGroup::Criteria & selection_criteria
-  ACE_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   ACE_UNUSED_ARG (selection_criteria);
@@ -509,7 +509,7 @@ TAO::FT_ReplicationManager::get_factory_registry (
 // TAO-specific shutdown operation.
 //public
 void TAO::FT_ReplicationManager::shutdown (
-  ACE_ENV_SINGLE_ARG_DECL)
+  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   this->quit_ = 1;
@@ -525,8 +525,7 @@ char * TAO::FT_ReplicationManager::type_id (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    result = group->get_type_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    result = group->get_type_id ();
   }
   else
   {
@@ -543,12 +542,12 @@ void
 TAO::FT_ReplicationManager::set_default_properties (
   const PortableGroup::Properties & props
   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
+  ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
 
-  this->properties_support_.set_default_properties (props);
+  this->properties_support_.set_default_properties (props ACE_ENV_ARG_PARAMETER);
   //@@ validate properties?
 }
 
@@ -656,12 +655,11 @@ TAO::FT_ReplicationManager::get_properties (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    group->get_properties (result ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    group->get_properties (result);
   }
   else
   {
-    ACE_THROW (PortableGroup::ObjectGroupNotFound ());
+    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), 0);
   }
   return result._retn();
 }
@@ -695,7 +693,7 @@ TAO::FT_ReplicationManager::set_primary_member (
     TAO_FT_IOGR_Property prop (tag_component);
 
     int sts = group->set_primary_member (&prop, the_location ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (FT_ObjectGroup::_nil ());
+    ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
     if (sts)
     {
       result = group->reference ();
@@ -878,7 +876,7 @@ TAO::FT_ReplicationManager::get_object_group_id (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    group->get_object_group_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+    group->get_object_group_id ();
     ACE_CHECK_RETURN (result);
     result = group->get_object_group_id ();
   }
@@ -1092,3 +1090,69 @@ int TAO::FT_ReplicationManager::write_ior ()
   return result;
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index d5969a02e3f..3536274bd0d 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -125,7 +125,7 @@ namespace TAO
      * @param result is set to process return code if return value is non-zero.
      * @return zero to continue; nonzero to exit
      */
-    int idle(int & result);
+    int idle (int & result ACE_ENV_ARG_DECL);
 
 
     /**
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index 40ef13ae035..bf32bd3af12 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -527,7 +527,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
     result = -1;
   }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);  //@@ is this necessary?
 
   if (result == 0)
   {
@@ -792,7 +791,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::remove_failed_member (
       this->replication_manager_->remove_member (
         iogr,
         fault_event_desc.location.in()
-        ACE_ENV_ARG_DECL);
+        ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     new_iogr = temp_iogr._retn ();
   }