Merge in OCI_Reliability_Enhancements branch.

1 files changed, 182 insertions, 0 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
new file mode 100644
index 00000000000..4617755347d
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
@@ -0,0 +1,182 @@
+// $Id$
+
+#include "orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h"
+#include "orbsvcs/PortableGroup/PG_Object_Group_Storable.h"
+
+#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h"
+#include "tao/Stub.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO::FT_PG_Object_Group_Storable::FT_PG_Object_Group_Storable (
+  CORBA::ORB_ptr orb,
+  PortableGroup::FactoryRegistry_ptr factory_registry,
+  TAO::PG_Object_Group_Manipulator & manipulator,
+  CORBA::Object_ptr empty_group,
+  const PortableGroup::TagGroupTaggedComponent & tagged_component,
+  const char * type_id,
+  const PortableGroup::Criteria & the_criteria,
+  TAO::PG_Property_Set * type_properties,
+  TAO::Storable_Factory & storable_factory)
+  : PG_Object_Group_Storable(orb,
+                             factory_registry,
+                             manipulator,
+                             empty_group,
+                             tagged_component,
+                             type_id,
+                             the_criteria,
+                             type_properties,
+                             storable_factory)
+  , stale_ (false)
+  , file_created_ (false)
+{
+}
+
+TAO::FT_PG_Object_Group_Storable::FT_PG_Object_Group_Storable (
+  PortableGroup::ObjectGroupId group_id,
+  CORBA::ORB_ptr orb,
+  PortableGroup::FactoryRegistry_ptr factory_registry,
+  TAO::PG_Object_Group_Manipulator & manipulator,
+  TAO::Storable_Factory & storable_factory)
+  : PG_Object_Group_Storable(group_id,
+                             orb,
+                             factory_registry,
+                             manipulator,
+                             storable_factory)
+  , stale_ (false)
+  , file_created_ (true)
+{
+}
+
+TAO::FT_PG_Object_Group_Storable::~FT_PG_Object_Group_Storable (void)
+{
+}
+
+void
+TAO::FT_PG_Object_Group_Storable::stale (bool is_stale)
+{
+  this->stale_ = is_stale;
+}
+
+bool
+TAO::FT_PG_Object_Group_Storable::stale ()
+{
+  return this->stale_;
+}
+
+int
+TAO::FT_PG_Object_Group_Storable::propagate_update_notification
+  (FT_Naming::ChangeType change_type)
+{
+  // Notify the peer of the changed context
+  FT_Naming::ReplicationManager_var peer =
+    TAO_FT_Naming_Replication_Manager::peer_replica ();
+
+  if (CORBA::is_nil (peer.in ()))
+    {
+      // Replication is not supported without a peer replica.
+      return 1;
+    }
+
+  FT_Naming::ObjectGroupUpdate object_group_info;
+  object_group_info.id = PG_Object_Group::get_object_group_id ();
+  object_group_info.change_type = change_type;
+
+  try {
+    // Notify the naming_manager of the updated context
+    if (TAO_debug_level > 3)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("%T %n (%P|%t) - ")
+                    ACE_TEXT ("Notifying peer that object group with ID %lld ")
+                    ACE_TEXT ("has been updated"), object_group_info.id
+                    ));
+      }
+    peer->notify_updated_object_group (object_group_info);
+  }
+  catch (CORBA::Exception& ex)
+    {
+      if (TAO_debug_level > 3)
+        ex._tao_print_exception (
+          ACE_TEXT ("Unable to communicate with peer.\n"));
+      return -1;
+    }
+
+  return 0;
+}
+
+void
+TAO::FT_PG_Object_Group_Storable::state_written (void)
+{
+  FT_Naming::ChangeType change_type;
+
+  if (!this->file_created_)
+    {
+      change_type = FT_Naming::NEW;
+      this->file_created_ = true;
+    }
+  else if (this->destroyed_)
+    change_type = FT_Naming::DELETED;
+  else
+    change_type = FT_Naming::UPDATED;
+
+  // If peer is available notify that state has changed.
+  // Otherwise, rely on file time stamps exclusively
+  // for update notification.
+  this->propagate_update_notification (change_type);
+
+  this->write_occurred_ = false;
+}
+
+bool
+TAO::FT_PG_Object_Group_Storable::is_obsolete (time_t stored_time)
+{
+  ACE_UNUSED_ARG (stored_time);
+  return (!this->loaded_from_stream_) || this->stale_;
+}
+
+PortableGroup::ObjectGroup_ptr
+TAO::FT_PG_Object_Group_Storable::add_member_to_iogr (CORBA::Object_ptr member)
+{
+  // If this is the first member added to the group and it's type_id does
+  // not match the member, then the object group should assume the same
+  // type id as the first member.  We will need to replace the object
+  // reference with an empty reference of the specified type id.
+
+  if (CORBA::is_nil (member))
+    {// A null object reference is not an acceptable member of the group.
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) ERROR: Unable to add null member ")
+                  ACE_TEXT ("to object group with id: %s\n"),
+                  this->tagged_component_.object_group_id));
+      return CORBA::Object::_nil ();
+    }
+
+  const char* member_type_id = member->_stubobj ()->type_id.in ();
+
+  if ((this->members_.current_size () == 0) &&
+      (ACE_OS::strcmp (this->type_id_, member_type_id) != 0) )
+    {
+      try {
+        this->type_id_ = member_type_id;
+        this->reference_ = manipulator_.create_object_group_using_id (
+           this->type_id_,
+           this->tagged_component_.group_domain_id,
+           this->tagged_component_.object_group_id);
+      }
+      catch (const CORBA::Exception&)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("(%P|%t) ERROR: Unable to add member ")
+                      ACE_TEXT ("to object group with id: %s for object ")
+                      ACE_TEXT ("of type: %s\n"),
+                      this->tagged_component_.object_group_id,
+                      member_type_id));
+          return CORBA::Object::_nil ();
+        }
+    }
+
+  return PG_Object_Group::add_member_to_iogr (member);
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL