[jbosscache-commits] JBoss Cache SVN: r5347 - in core/trunk/src/main/java/org/jboss/cache: statetransfer and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-02-12 16:13:50 -0500 (Tue, 12 Feb 2008)
New Revision: 5347

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java
Log:
Don't add buddy backup root to internalFqns unless BR is enabled!

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-02-12 19:41:54 UTC (rev 5346)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-02-12 21:13:50 UTC (rev 5347)
@@ -163,8 +163,6 @@
       this.configuration = configuration;
       this.componentRegistry = new ComponentRegistry(configuration);
       this.cacheStatus = CacheStatus.INSTANTIATED;
-
-      internalFqns.add(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN);
    }
 
    protected ComponentRegistry getComponentRegistry()
@@ -441,7 +439,14 @@
       // the interceptor chain cannot start until the rpcManager is started.  And similarly, the buddyManager relies on the
       // rpcManager being started.
       if (rpcManager != null) rpcManager.start();
-      if (buddyManager != null) buddyManager.init();
+      if (buddyManager != null)
+      {
+         buddyManager.init();
+         if (buddyManager.isEnabled())
+         {
+            internalFqns.add(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN);
+         }
+      }
    }
 
    private void addShutdownHook()

Modified: core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java	2008-02-12 19:41:54 UTC (rev 5346)
+++ core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java	2008-02-12 21:13:50 UTC (rev 5347)
@@ -238,8 +238,6 @@
 
    private void integrateTransientState(NodeSPI target, ObjectInputStream in) throws Exception
    {
-      Set<Node> retainedNodes = retainInternalNodes(target);
-
       target.removeChildrenDirect();
 
       List<NodeData> list = readNodesAsList(in);
@@ -271,7 +269,7 @@
 
                integrateStateTransferChildren(target, offset, nodeDataIterator);
 
-               integrateRetainedNodes(target, retainedNodes);
+               integrateRetainedNodes(target);
             }
          }
 
@@ -394,14 +392,15 @@
       return result;
    }
 
-   private void integrateRetainedNodes(NodeSPI root, Set<Node> retainedNodes)
+   private void integrateRetainedNodes(NodeSPI target)
    {
-      Fqn rootFqn = root.getFqn();
+      Set<Node> retainedNodes = retainInternalNodes(target);
+      Fqn rootFqn = target.getFqn();
       for (Node retained : retainedNodes)
       {
          if (retained.getFqn().isChildOf(rootFqn))
          {
-            integrateRetainedNode(root, retained);
+            integrateRetainedNode(target, retained);
          }
       }
    }