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

[Manik Surtani]

  User: msurtani
  Date: 06/08/09 10:50:00

  Modified:    src/org/jboss/cache/buddyreplication   BuddyManager.java
                        NextMemberBuddyLocator.java
  Log:
  Merged in fixes from 1.4.0.SP1
  
  Revision  Changes    Path
  1.39      +5 -13     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.38
  retrieving revision 1.39
  diff -u -b -r1.38 -r1.39
  --- BuddyManager.java	20 Jul 2006 21:58:22 -0000	1.38
  +++ BuddyManager.java	9 Aug 2006 14:49:59 -0000	1.39
  @@ -132,7 +132,7 @@
           }
           finally
           {
  -            if (log.isInfoEnabled()) log.info("Using buddy communication timeout of " + buddyCommunicationTimeout + " millis");
  +            if (log.isDebugEnabled()) log.debug("Using buddy communication timeout of " + buddyCommunicationTimeout + " millis");
           }
           buddyPoolName = XmlHelper.readStringContents(element, "buddyPoolName");
           if (buddyPoolName != null && buddyPoolName.equals("")) buddyPoolName = null;
  @@ -493,10 +493,7 @@
   
       private void removeFromGroup(List buddies)
       {
  -        if (log.isInfoEnabled())
  -        {
  -            log.info("Removing obsolete buddies from buddy group [" + buddyGroup.getGroupName() + "].  Obsolete buddies are " + buddies);
  -        }
  +        if (log.isDebugEnabled()) log.debug("Removing obsolete buddies from buddy group [" + buddyGroup.getGroupName() + "].  Obsolete buddies are " + buddies);
           buddyGroup.buddies.removeAll(buddies);
           // now broadcast a message to the removed buddies.
           MethodCall membershipCall = MethodCallFactory.create(MethodDeclarations.remoteRemoveFromBuddyGroupMethod, new Object[]{buddyGroup.getGroupName()});
  @@ -521,10 +518,8 @@
   //          return;
   
   
  -        if (log.isInfoEnabled())
  -        {
  -            log.info("Assigning new buddies to buddy group [" + buddyGroup.getGroupName() + "].  New buddies are " + buddies);
  -        }
  +        if (log.isDebugEnabled()) log.debug("Assigning new buddies to buddy group [" + buddyGroup.getGroupName() + "].  New buddies are " + buddies);
  +
   
           buddyGroup.buddies.addAll(buddies);
   
  @@ -651,10 +646,7 @@
       private void broadcastBuddyPoolMembership(List recipients)
       {
           // broadcast to other caches
  -        if (log.isInfoEnabled())
  -        {
  -            log.info("Instance " + buddyGroup.getDataOwner() + " broadcasting membership in buddy pool " + buddyPoolName + " to recipients " + recipients);
  -        }
  +        if (log.isDebugEnabled()) log.debug("Instance " + buddyGroup.getDataOwner() + " broadcasting membership in buddy pool " + buddyPoolName + " to recipients " + recipients);
   
           MethodCall membershipCall = MethodCallFactory.create(MethodDeclarations.remoteAnnounceBuddyPoolNameMethod, new Object[]{buddyGroup.getDataOwner(), buddyPoolName});
           MethodCall replicateCall = MethodCallFactory.create(MethodDeclarations.replicateMethod, new Object[]{membershipCall});
  
  
  
  1.4       +4 -12     JBossCache/src/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NextMemberBuddyLocator.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- NextMemberBuddyLocator.java	26 Apr 2006 16:43:42 -0000	1.3
  +++ NextMemberBuddyLocator.java	9 Aug 2006 14:49:59 -0000	1.4
  @@ -77,10 +77,8 @@
               {
                   ignoreColocatedBuddiesForSession = false;
                   i = 0;
  -                if (log.isWarnEnabled())
  -                {
  -                    log.warn("Expected to look for " + numBuddiesToFind + " buddies but could only find " + buddies.size() + " suitable candidates - trying with colocated buddies as well.");
  -                }
  +                if (log.isInfoEnabled()) log.info("Expected to look for " + numBuddiesToFind + " buddies but could only find " + buddies.size() + " suitable candidates - trying with colocated buddies as well.");
  +
                   continue;
               }
   
  @@ -90,10 +88,7 @@
                   buddyPoolMap = null;
                   ignoreColocatedBuddiesForSession = ignoreColocatedBuddies; // reset this flag
                   i = 0;
  -                if (log.isWarnEnabled())
  -                {
  -                    log.warn("Expected to look for " + numBuddiesToFind + " buddies but could only find " + buddies.size() + " suitable candidates - trying again, ignoring buddy pool hints.");
  -                }
  +                if (log.isInfoEnabled()) log.info("Expected to look for " + numBuddiesToFind + " buddies but could only find " + buddies.size() + " suitable candidates - trying again, ignoring buddy pool hints.");
                   continue;
               }
   
  @@ -101,10 +96,7 @@
               // completely and still havent found any more suitable candidates.  Give up with however many we have.
               if (subscript >= currentMembership.size())
               {
  -                if (log.isWarnEnabled())
  -                {
  -                    log.warn("Expected to look for " + numBuddiesToFind + " buddies but could only find " + buddies.size() + " suitable candidates!");
  -                }
  +                if (log.isInfoEnabled()) log.info("Expected to look for " + numBuddiesToFind + " buddies but could only find " + buddies.size() + " suitable candidates!");
                   break;
               }