[jbosscache-commits] JBoss Cache SVN: r6005 - in core/branches/2.2.X/src: test/java/org/jboss/cache/buddyreplication and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-06-19 21:27:44 -0400 (Thu, 19 Jun 2008)
New Revision: 6005

Modified:
   core/branches/2.2.X/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java
   core/branches/2.2.X/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java
Log:
[JBCACHE-1374] BuddyFqnTransformer.getBackupRootFromFqn() handles "_BUDDY_BACKUP_"

Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java
===================================================================
--- core/branches/2.2.X/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java	2008-06-19 22:23:38 UTC (rev 6004)
+++ core/branches/2.2.X/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java	2008-06-20 01:27:44 UTC (rev 6005)
@@ -145,7 +145,7 @@
     */
    public Fqn getBackupRootFromFqn(Fqn fqn)
    {
-      if (isBackupFqn(fqn))
+      if (isBackupFqn(fqn) && fqn.size() > 1)
       {
          return fqn.getSubFqn(0, isDeadBackupFqn(fqn) ? 3 : 2);
       }

Modified: core/branches/2.2.X/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java
===================================================================
--- core/branches/2.2.X/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java	2008-06-19 22:23:38 UTC (rev 6004)
+++ core/branches/2.2.X/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java	2008-06-20 01:27:44 UTC (rev 6005)
@@ -34,4 +34,9 @@
    {
       assert Fqn.ROOT == buddyFqnTransformer.getActualFqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN);
    }
+
+   public void testBackupRootFromFqnOnBuddyBackupRoot()
+   {
+      assert Fqn.ROOT == buddyFqnTransformer.getBackupRootFromFqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN);
+   }
 }