[jbosscache-commits] JBoss Cache SVN: r6159 - in core/trunk/src: main/java/org/jboss/cache/buddyreplication and 2 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Thu Jul 3 09:20:58 EDT 2008
Author: manik.surtani at jboss.com
Date: 2008-07-03 09:20:58 -0400 (Thu, 03 Jul 2008)
New Revision: 6159
Modified:
core/trunk/src/main/java/org/jboss/cache/RegionManager.java
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java
Log:
Fixed failing BR tests
Modified: core/trunk/src/main/java/org/jboss/cache/RegionManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2008-07-03 12:20:17 UTC (rev 6158)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2008-07-03 13:20:58 UTC (rev 6159)
@@ -486,8 +486,9 @@
// We'll update this node with the state we receive
// need to obtain all necessary locks.
// needs to be a LOCAL call!
+ NodeSPI root = cache.getRoot();
cache.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
- subtreeRoot = cache.getRoot().addChild(buddyRoot);
+ subtreeRoot = root.addChild(buddyRoot);
cache.getInvocationContext().getOptionOverrides().setCacheModeLocal(false);
}
rpcManager.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-07-03 12:20:17 UTC (rev 6158)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-07-03 13:20:58 UTC (rev 6159)
@@ -595,7 +595,7 @@
o = cache.getInvocationContext().getOptionOverrides();
o.setCacheModeLocal(true);
o.setSkipCacheStatusCheck(true);
- cache.getRoot().addChild(Fqn.fromElements(BUDDY_BACKUP_SUBTREE, newGroup.getGroupName()));
+ dataContainer.getRoot().addChild(Fqn.fromElements(BUDDY_BACKUP_SUBTREE, newGroup.getGroupName()));
}
else
{
@@ -1061,7 +1061,7 @@
// where N is a number.
Fqn<String> defunctRoot = buddyFqnTransformer.getDeadBackupRoot(dataOwner);
cache.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
- Node defunctRootNode = cache.getRoot().addChild(defunctRoot);
+ Node defunctRootNode = dataContainer.getRoot().addChild(defunctRoot);
SortedSet childrenNames = new TreeSet(defunctRootNode.getChildrenNames()); // will be naturally sorted.
Integer childName = 1;
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java 2008-07-03 12:20:17 UTC (rev 6158)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java 2008-07-03 13:20:58 UTC (rev 6159)
@@ -146,6 +146,7 @@
protected Object executeCommand(ReplicableCommand cmd, Message req) throws Throwable
{
+ if (cmd == null) throw new NullPointerException("Unable to execute a null command! Message was " + req);
if (trace) log.trace("Executing command: " + cmd + " [sender=" + req.getSrc() + "]");
if (cmd instanceof VisitableCommand)
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java 2008-07-03 12:20:17 UTC (rev 6158)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java 2008-07-03 13:20:58 UTC (rev 6159)
@@ -40,12 +40,12 @@
public void testConstruction1() throws Exception
{
String xmlConfig =
- " <buddyReplication enabled=\"true\" buddyPoolName=\"groupOne\">\n" +
- " <buddyLocator>\n" +
+ " <buddy enabled=\"true\" poolName=\"groupOne\">\n" +
+ " <locator>\n" +
" <properties>\n" +
" numBuddies = 3\n" +
" </properties>\n" +
- " </buddyLocator>\n" +
+ " </locator>\n" +
" </buddyReplication>";
BuddyReplicationConfig config = getBuddyReplicationConfig(xmlConfig);
BuddyManager mgr = new BuddyManager(config);
@@ -74,12 +74,12 @@
public void testConstruction2() throws Exception
{
String xmlConfig =
- " <buddyReplication enabled=\"true\" buddyPoolName=\"groupOne\">\n" +
- " <buddyLocator class=\"org.i.dont.exist.PhantomBuddyLocator\">\n" +
+ " <buddy enabled=\"true\" poolName=\"groupOne\">\n" +
+ " <locator class=\"org.i.dont.exist.PhantomBuddyLocator\">\n" +
" <properties>\n" +
" numBuddies = 3\n" +
" </properties>\n" +
- " </buddyLocator>\n" +
+ " </locator>\n" +
" </buddyReplication>";
BuddyReplicationConfig config = getBuddyReplicationConfig(xmlConfig);
BuddyManager mgr = new BuddyManager(config);
@@ -101,7 +101,7 @@
*/
public void testConstruction3() throws Exception
{
- String xmlConfig = "<buddyReplication enabled=\"false\"/>";
+ String xmlConfig = "<buddy enabled=\"false\"/>";
BuddyReplicationConfig config = getBuddyReplicationConfig(xmlConfig);
BuddyManager mgr = new BuddyManager(config);
assertTrue(!mgr.isEnabled());
@@ -114,7 +114,7 @@
*/
public void testConstruction4() throws Exception
{
- String xmlConfig = "<buddyReplication enabled=\"true\"/>";
+ String xmlConfig = "<buddy enabled=\"true\"/>";
BuddyReplicationConfig config = getBuddyReplicationConfig(xmlConfig);
BuddyManager mgr = new BuddyManager(config);
@@ -132,7 +132,7 @@
BuddyManager bm = null;
try
{
- String xmlConfig = "<buddyReplication enabled=\"false\"/>";
+ String xmlConfig = "<buddy enabled=\"false\"/>";
BuddyReplicationConfig config = getBuddyReplicationConfig(xmlConfig);
bm = new BuddyManager(config);
bm.injectDependencies(null, null, null, null, null, null, null, null, new BuddyFqnTransformer());
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java 2008-07-03 12:20:17 UTC (rev 6158)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java 2008-07-03 13:20:58 UTC (rev 6159)
@@ -11,11 +11,11 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.config.BuddyReplicationConfig;
import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.parsing.XmlConfigHelper;
import org.jboss.cache.config.parsing.XmlConfigurationParser;
+import org.jboss.cache.config.parsing.element.BuddyElementParser;
import org.jboss.cache.interceptors.DataGravitatorInterceptor;
import org.jboss.cache.interceptors.base.CommandInterceptor;
-import org.jboss.cache.config.parsing.XmlConfigHelper;
-import org.jboss.cache.config.parsing.element.BuddyElementParser;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -47,7 +47,7 @@
public void testDisabledConfig() throws Exception
{
- String xmlConfig = "<buddyReplication enabled=\"false\"/>";
+ String xmlConfig = "<buddy enabled=\"false\"/>";
BuddyReplicationConfig config = getBuddyReplicationConfig(xmlConfig);
cache = (CacheSPI<Object, Object>) new DefaultCacheFactory<Object, Object>().createCache(false);
cache.getConfiguration().setBuddyReplicationConfig(config);
@@ -56,7 +56,7 @@
public void testBasicConfig() throws Exception
{
- String xmlConfig = "<buddyReplication enabled=\"true\"/>";
+ String xmlConfig = "<buddy enabled=\"true\"/>";
BuddyReplicationConfig config = getBuddyReplicationConfig(xmlConfig);
cache = (CacheSPI<Object, Object>) new DefaultCacheFactory<Object, Object>().createCache(false);
cache.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_SYNC);
@@ -112,8 +112,8 @@
public void testLocalModeConfig() throws Exception
{
- String xmlConfig = "<buddyReplication enabled=\"true\"/>";
- BuddyReplicationConfig config = getBuddyReplicationConfig(xmlConfig);
+ String xmlConfig = "<buddy enabled=\"true\"/>";
+ BuddyReplicationConfig config = getBuddyReplicationConfig(xmlConfig);
cache = (CacheSPI<Object, Object>) new DefaultCacheFactory<Object, Object>().createCache(false);
cache.getConfiguration().setBuddyReplicationConfig(config);
cache.create();
More information about the jbosscache-commits
mailing list