Author: bstansberry(a)jboss.com Date: 2008-01-15 00:17:56 -0500 (Tue, 15 Jan 2008) New Revision: 5131 Modified: core/trunk/src/main/java/org/jboss/cache/RegionManager.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java Log: [JBCACHE-1266] Use Cache.put(Fqn, null) as workaround for Node.addChild(Fqn) Modified: core/trunk/src/main/java/org/jboss/cache/RegionManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2008-01-15 03:51:56 UTC (rev 5130) +++ core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2008-01-15 05:17:56 UTC (rev 5131) @@ -433,7 +433,11 @@ // need to obtain all necessary locks. // needs to be a LOCAL call! cache.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - subtreeRoot = cache.getRoot().addChild(buddyRoot); + // FIXME -- restore the next line and remove the 2 following + // when JBCACHE-1265 is fixed + //subtreeRoot = cache.getRoot().addChild(buddyRoot); + cache.put(buddyRoot, null); + subtreeRoot = cache.getRoot().getChild(buddyRoot); cache.getInvocationContext().getOptionOverrides().setCacheModeLocal(false); } cache.fetchPartialState(sources, fqn, subtreeRoot.getFqn()); Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-01-15 03:51:56 UTC (rev 5130) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-01-15 05:17:56 UTC (rev 5131) @@ -538,7 +538,10 @@ o = cache.getInvocationContext().getOptionOverrides(); o.setCacheModeLocal(true); o.setSkipCacheStatusCheck(true); - root.addChild(new Fqn<String>(BUDDY_BACKUP_SUBTREE, newGroup.getGroupName())); + // FIXME -- restore the next line and remove the following one + // when JBCACHE-1265 is fixed +// root.addChild(new Fqn<String>(BUDDY_BACKUP_SUBTREE, newGroup.getGroupName())); + cache.put(new Fqn<String>(BUDDY_BACKUP_SUBTREE, newGroup.getGroupName()), null); } else {