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

[Manik Surtani]

  User: msurtani
  Date: 07/05/24 14:14:00

  Modified:    src/org/jboss/cache  RegionManager.java
  Log:
  fixed buggy stuff around BG comms
  
  Revision  Changes    Path
  1.37      +8 -12     JBossCache/src/org/jboss/cache/RegionManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RegionManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/RegionManager.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- RegionManager.java	24 Apr 2007 15:27:21 -0000	1.36
  +++ RegionManager.java	24 May 2007 18:14:00 -0000	1.37
  @@ -369,9 +369,6 @@
   
            Region region = getRegion(fqn, true);
   
  -         // If a classloader is registered for the node's region, use it
  -         ClassLoader cl = region.getClassLoader();
  -
            BuddyManager buddyManager = cache.getBuddyManager();
            // Request partial state from the cluster and integrate it
            if (buddyManager == null)
  @@ -391,11 +388,10 @@
            {
               // Get the state from each DataOwner and integrate in their
               // respective buddy backup cache
  -            List buddies = buddyManager.getBuddyAddresses();
  -            for (Iterator it = buddies.iterator(); it.hasNext();)
  +            List<Address> buddies = buddyManager.getBuddyAddresses();
  +            for (Address buddy : buddies)
               {
  -               Address buddy = (Address) it.next();
  -               List <Address> sources = new ArrayList<Address>(1);
  +               List<Address> sources = new ArrayList<Address>(1);
                  sources.add(buddy);
                  Fqn base = new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, BuddyManager.getGroupNameFromAddress(buddy));
                  Fqn buddyRoot = new Fqn(base, fqn);
  @@ -405,7 +401,7 @@
                     // We'll update this node with the state we receive
                     subtreeRoot = cache.createSubtreeRootNode(buddyRoot);
                  }
  -               cache.fetchPartialState(sources, subtreeRoot.getFqn());
  +               cache.fetchPartialState(sources, fqn, subtreeRoot.getFqn());
               }
            }
         }
  @@ -713,7 +709,7 @@
       */
      public List<Region> getAllRegions(Region.Type type)
      {
  -      List<Region> regions = null;
  +      List<Region> regions;
   
         if (type != Region.Type.ANY)
         {