[jbosscache-commits] JBoss Cache SVN: r7560 - core/trunk/src/main/java/org/jboss/cache/buddyreplication.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-01-21 10:08:15 -0500 (Wed, 21 Jan 2009)
New Revision: 7560

Modified:
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
Log:
only add the new buddies to the buddy group aftert the announceBuddyPool command is successfully executed

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java	2009-01-21 14:02:00 UTC (rev 7559)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java	2009-01-21 15:08:15 UTC (rev 7560)
@@ -55,6 +55,16 @@
     */
    private final Vector<Address> buddies = new Vector<Address>();
 
+   public BuddyGroup()
+   {
+   }
+
+   public BuddyGroup(String groupName, Address dataOwner)
+   {
+      this.groupName = groupName;
+      this.dataOwner = dataOwner;
+   }
+
    public String getGroupName()
    {
       return groupName;

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java	2009-01-21 14:02:00 UTC (rev 7559)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java	2009-01-21 15:08:15 UTC (rev 7560)
@@ -836,7 +836,8 @@
       {
          log.debug("Assigning new buddies to buddy group [" + buddyGroup.getGroupName() + "].  New buddies are " + buddies);
       }
-      buddyGroup.addBuddies(buddies);
+      BuddyGroup toBe = new BuddyGroup(buddyGroup.getGroupName(), buddyGroup.getDataOwner());
+      toBe.addBuddies(buddies);
       // Create the state transfer map
       Map<Fqn, byte[]> stateMap = new HashMap<Fqn, byte[]>();
       if (configuredToFetchState())
@@ -879,7 +880,7 @@
       }
 
       // now broadcast a message to the newly assigned buddies.
-      AssignToBuddyGroupCommand membershipCall = commandsFactory.buildAssignToBuddyGroupCommand(buddyGroup, stateMap);
+      AssignToBuddyGroupCommand membershipCall = commandsFactory.buildAssignToBuddyGroupCommand(toBe, stateMap);
 
       int attemptsLeft = UNINIT_BUDDIES_RETRIES;
       int currentAttempt = 0;
@@ -928,7 +929,7 @@
             }
          }
       }
-
+      buddyGroup.addBuddies(buddies);
       log.trace("addToGroup notification complete");
    }