[jboss-cvs] JBossCache/src/org/jboss/cache ...

[Manik Surtani]

  User: msurtani
  Date: 06/11/09 08:42:26

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        TreeCache.java
  Log:
  do not attempt to transfer state for buddy backup regions if they are activated.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.195.2.20 +44 -37    JBossCache/src/org/jboss/cache/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
  retrieving revision 1.195.2.19
  retrieving revision 1.195.2.20
  diff -u -b -r1.195.2.19 -r1.195.2.20
  --- TreeCache.java	7 Nov 2006 18:17:56 -0000	1.195.2.19
  +++ TreeCache.java	9 Nov 2006 13:42:26 -0000	1.195.2.20
  @@ -52,7 +52,6 @@
   import org.jgroups.Message;
   import org.jgroups.MessageListener;
   import org.jgroups.View;
  -import org.jgroups.ViewId;
   import org.jgroups.blocks.GroupRequest;
   import org.jgroups.blocks.MethodCall;
   import org.jgroups.blocks.RpcDispatcher;
  @@ -99,7 +98,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.195.2.19 2006/11/07 18:17:56 bstansberry Exp $
  + * @version $Id: TreeCache.java,v 1.195.2.20 2006/11/09 13:42:26 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -1873,6 +1872,13 @@
            ClassLoader cl = region.getClassLoader();
   
            // Request partial state from the cluster and integrate it
  +         if (BuddyManager.isBackupFqn(fqn))
  +         {
  +            if (log.isDebugEnabled())
  +               log.debug("Not attempting to load state for a buddy backup Fqn that has just been activated: " + fqn);
  +         }
  +         else
  +         {
            if (buddyManager == null)
            {
               // Get the state from any node that has it and put it
  @@ -1904,6 +1910,7 @@
                  _loadState(fqn, subtreeRoot, sources, cl);
               }
            }
  +         }
   
            // Lock out other activity on the region while we
            // we process the queue and activate the region