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

[Manik Surtani]

  User: msurtani
  Date: 06/12/21 12:59:01

  Modified:    src/org/jboss/cache/buddyreplication  BuddyManager.java
  Log:
  Increased robustness
  
  Revision  Changes    Path
  1.53      +11 -11    JBossCache/src/org/jboss/cache/buddyreplication/BuddyManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BuddyManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/buddyreplication/BuddyManager.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -b -r1.52 -r1.53
  --- BuddyManager.java	21 Dec 2006 16:19:33 -0000	1.52
  +++ BuddyManager.java	21 Dec 2006 17:59:01 -0000	1.53
  @@ -876,6 +876,17 @@
            log.trace("Waiting for enqueued view change events");
            MembershipChange members = queue.take();
   
  +         log.trace("Broadcasting pool membership details, triggered by view change.");
  +         if (members.oldMembers == null)
  +            broadcastBuddyPoolMembership();
  +         else
  +         {
  +            List<Address> delta = new ArrayList<Address>();
  +            delta.addAll(members.newMembers);
  +            delta.removeAll(members.oldMembers);
  +            broadcastBuddyPoolMembership(delta);
  +         }
  +
            // make sure new buddies have broadcast their pool memberships.
            while (!buddyPoolInfoAvailable(members.newMembers))
            {
  @@ -886,17 +897,6 @@
               }
            }
   
  -         log.trace("Broadcasting pool membership details, triggered by view change.");
  -         //if (members.oldMembers == null)
  -         broadcastBuddyPoolMembership();
  -//         else
  -//         {
  -//            List<Address> delta = new ArrayList<Address>();
  -//            delta.addAll(members.newMembers);
  -//            delta.removeAll(members.oldMembers);
  -//            broadcastBuddyPoolMembership(delta);
  -//         }
  -
            // always refresh buddy list.
            reassignBuddies(members.newMembers);
         }