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

[Brian Stansberry]

  User: bstansberry
  Date: 06/08/13 16:10:10

  Modified:    src/org/jboss/cache/buddyreplication   Tag:
                        Branch_JBossCache_1_4_0_MUX
                        NextMemberBuddyLocator.java BuddyManager.java
  Log:
  Update to 1.4.0.SP1
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.4.1   +8 -8      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.3.4.1
  diff -u -b -r1.3 -r1.3.4.1
  --- NextMemberBuddyLocator.java	26 Apr 2006 16:43:42 -0000	1.3
  +++ NextMemberBuddyLocator.java	13 Aug 2006 20:10:10 -0000	1.3.4.1
  @@ -77,9 +77,9 @@
               {
                   ignoreColocatedBuddiesForSession = false;
                   i = 0;
  -                if (log.isWarnEnabled())
  +                if (log.isInfoEnabled())
                   {
  -                    log.warn("Expected to look for " + numBuddiesToFind + " buddies but could only find " + buddies.size() + " suitable candidates - trying with colocated buddies as well.");
  +                    log.info("Expected to look for " + numBuddiesToFind + " buddies but could only find " + buddies.size() + " suitable candidates - trying with colocated buddies as well.");
                   }
                   continue;
               }
  @@ -90,9 +90,9 @@
                   buddyPoolMap = null;
                   ignoreColocatedBuddiesForSession = ignoreColocatedBuddies; // reset this flag
                   i = 0;
  -                if (log.isWarnEnabled())
  +                if (log.isInfoEnabled())
                   {
  -                    log.warn("Expected to look for " + numBuddiesToFind + " buddies but could only find " + buddies.size() + " suitable candidates - trying again, ignoring buddy pool hints.");
  +                    log.info("Expected to look for " + numBuddiesToFind + " buddies but could only find " + buddies.size() + " suitable candidates - trying again, ignoring buddy pool hints.");
                   }
                   continue;
               }
  @@ -101,9 +101,9 @@
               // completely and still havent found any more suitable candidates.  Give up with however many we have.
               if (subscript >= currentMembership.size())
               {
  -                if (log.isWarnEnabled())
  +                if (log.isInfoEnabled())
                   {
  -                    log.warn("Expected to look for " + numBuddiesToFind + " buddies but could only find " + buddies.size() + " suitable candidates!");
  +                    log.info("Expected to look for " + numBuddiesToFind + " buddies but could only find " + buddies.size() + " suitable candidates!");
                   }
                   break;
               }
  @@ -158,9 +158,9 @@
           catch (SocketException e)
           {
               if (log.isDebugEnabled()) log.debug("Unable to read NICs on host", e);
  -            if (log.isWarnEnabled())
  +            if (log.isInfoEnabled())
               {
  -                log.warn("UNable to read all network interfaces on host " + inetD + " to determine colocation of " + inetC + ".  Assuming " + inetC + " is NOT colocated with " + inetD);
  +                log.info("UNable to read all network interfaces on host " + inetD + " to determine colocation of " + inetC + ".  Assuming " + inetC + " is NOT colocated with " + inetD);
               }
           }
   
  
  
  
  1.33.4.2  +4 -4      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.33.4.1
  retrieving revision 1.33.4.2
  diff -u -b -r1.33.4.1 -r1.33.4.2
  --- BuddyManager.java	21 Jul 2006 02:51:31 -0000	1.33.4.1
  +++ BuddyManager.java	13 Aug 2006 20:10:10 -0000	1.33.4.2
  @@ -123,7 +123,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;
  @@ -361,7 +361,7 @@
               log.trace("No uninitialized buddies found, nothing to announce.");
           }
   
  -        if (log.isDebugEnabled()) log.debug("New buddy group: " + buddyGroup);
  +        log.info("New buddy group: " + buddyGroup);
       }
   
       // -------------- methods to be called by the tree cache  --------------------
  @@ -673,9 +673,9 @@
       private void broadcastBuddyPoolMembership(List recipients)
       {
           // broadcast to other caches
  -        if (log.isInfoEnabled())
  +        if (log.isDebugEnabled())
           {
  -            log.info("Instance " + buddyGroup.getDataOwner() + " broadcasting membership in buddy pool " + buddyPoolName + " to recipients " + recipients);
  +            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});