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

[Manik Surtani]

  User: msurtani
  Date: 07/03/17 15:11:03

  Modified:    src/org/jboss/cache/buddyreplication  BuddyManager.java
  Log:
  Ported fixes relating to releasing 1.4.1.SP3 to HEAD.
  
  Revision  Changes    Path
  1.71      +3 -1      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.70
  retrieving revision 1.71
  diff -u -b -r1.70 -r1.71
  --- BuddyManager.java	13 Mar 2007 18:03:18 -0000	1.70
  +++ BuddyManager.java	17 Mar 2007 19:11:03 -0000	1.71
  @@ -356,7 +356,7 @@
      {
         if (log.isDebugEnabled())
         {
  -         log.debug(buddyGroup.getDataOwner() + ": received announcement that cache instance " + address + " is in buddy pool " + poolName);
  +         log.debug("BuddyManager@" + Integer.toHexString(hashCode()) + ": received announcement that cache instance " + address + " is in buddy pool " + poolName);
         }
         if (poolName != null)
         {
  @@ -475,6 +475,8 @@
   
      public static Fqn getBackupFqn(Object buddyGroupName, Fqn origFqn)
      {
  +      if (isBackupFqn(origFqn))
  +         throw new CacheException("Cannot make a backup Fqn from a backup Fqn! Attempting to create a backup of " + origFqn);
         List<Object> elements = new ArrayList<Object>();
         elements.add(BUDDY_BACKUP_SUBTREE);
         elements.add(buddyGroupName);