[jbosscache-commits] JBoss Cache SVN: r6261 - in core/trunk/src: main/java/org/jboss/cache/factories and 4 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Tue Jul 15 05:35:49 EDT 2008
Author: manik.surtani at jboss.com
Date: 2008-07-15 05:35:49 -0400 (Tue, 15 Jul 2008)
New Revision: 6261
Added:
core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyPassivationInterceptor.java
Modified:
core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java
core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java
core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/MoveCommandTest.java
core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFactoryTest.java
Log:
Cleaned up unit test failures
Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-15 09:14:04 UTC (rev 6260)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-15 09:35:49 UTC (rev 6261)
@@ -128,7 +128,6 @@
this.commandsFactory = commandsFactory;
this.lockStrategyFactory = lockStrategyFactory;
this.nodeFactory = nodeFactory;
- if (nodeFactory == null) throw new NullPointerException();
init();
}
Modified: core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java 2008-07-15 09:14:04 UTC (rev 6260)
+++ core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java 2008-07-15 09:35:49 UTC (rev 6261)
@@ -114,8 +114,14 @@
if (configuration.getCacheLoaderConfig().isPassivation())
{
if (configuration.getNodeLockingScheme() != NodeLockingScheme.MVCC)
+ {
interceptorChain.appendIntereceptor(createInterceptor(LegacyActivationInterceptor.class));
- interceptorChain.appendIntereceptor(createInterceptor(PassivationInterceptor.class));
+ interceptorChain.appendIntereceptor(createInterceptor(LegacyPassivationInterceptor.class));
+ }
+ else
+ {
+ interceptorChain.appendIntereceptor(createInterceptor(PassivationInterceptor.class));
+ }
}
else
{
@@ -153,7 +159,7 @@
if (interceptorChain.containsInstance(config.getInterceptor())) continue;
if (config.isFirst())
{
- interceptorChain.addInterceptor(config.getInterceptor(),0);
+ interceptorChain.addInterceptor(config.getInterceptor(), 0);
}
if (config.isLast()) interceptorChain.appendIntereceptor(config.getInterceptor());
if (config.getIndex() >= 0) interceptorChain.addInterceptor(config.getInterceptor(), config.getIndex());
Added: core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyPassivationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyPassivationInterceptor.java (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyPassivationInterceptor.java 2008-07-15 09:35:49 UTC (rev 6261)
@@ -0,0 +1,46 @@
+package org.jboss.cache.interceptors;
+
+import org.jboss.cache.DataContainer;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.commands.write.EvictCommand;
+import org.jboss.cache.factories.annotations.Inject;
+import org.jboss.cache.invocation.InvocationContext;
+
+import java.util.List;
+
+/**
+ * Passivation interceptor for optimistic and pessimistic locking
+ *
+ * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
+ * @since 3.0
+ */
+public class LegacyPassivationInterceptor extends PassivationInterceptor
+{
+ private DataContainer dataContainer;
+
+ @Inject
+ private void injectDataContainer(DataContainer dataContainer)
+ {
+ this.dataContainer = dataContainer;
+ }
+
+ @Override
+ public Object visitEvictFqnCommand(InvocationContext ctx, EvictCommand command) throws Throwable
+ {
+ if (command.isRecursive())
+ {
+ for (Fqn f : getNodeList(command.getFqn())) passivate(ctx, f);
+ }
+ else
+ {
+ passivate(ctx, command.getFqn());
+ }
+
+ return invokeNextInterceptor(ctx, command);
+ }
+
+ private List<Fqn> getNodeList(Fqn startingPoint)
+ {
+ return dataContainer.getNodesForEviction(startingPoint, true);
+ }
+}
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java 2008-07-15 09:14:04 UTC (rev 6260)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java 2008-07-15 09:35:49 UTC (rev 6261)
@@ -12,7 +12,6 @@
import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
@@ -46,10 +45,9 @@
@Override
public Object visitEvictFqnCommand(InvocationContext ctx, EvictCommand command) throws Throwable
{
- List<Fqn> fqnsToEvict;
- if (command.isRecursive() && (fqnsToEvict = command.getNodesToEvict()) != null && !fqnsToEvict.isEmpty())
+ if (command.isRecursive())
{
- for (Fqn f : fqnsToEvict) passivate(ctx, f);
+ for (Fqn f : command.getNodesToEvict()) passivate(ctx, f);
}
else
{
@@ -59,7 +57,7 @@
return invokeNextInterceptor(ctx, command);
}
- private void passivate(InvocationContext ctx, Fqn fqn) throws Throwable
+ protected void passivate(InvocationContext ctx, Fqn fqn) throws Throwable
{
try
{
Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java 2008-07-15 09:14:04 UTC (rev 6260)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java 2008-07-15 09:35:49 UTC (rev 6261)
@@ -289,7 +289,7 @@
protected void doCacheLoaderTest(boolean pasv, boolean useTx) throws Exception
{
cache.destroy();
- cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig(pasv, "/", DummyInMemoryCacheLoader.class.getName(), null, false, false, false, false));
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig(pasv, "/", DummyInMemoryCacheLoader.class.getName(), "debug=true", false, false, false, false));
cache.start();
DummyInMemoryCacheLoader loader = (DummyInMemoryCacheLoader) cache.getCacheLoaderManager().getCacheLoader();
Modified: core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/MoveCommandTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/MoveCommandTest.java 2008-07-15 09:14:04 UTC (rev 6260)
+++ core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/MoveCommandTest.java 2008-07-15 09:35:49 UTC (rev 6261)
@@ -34,7 +34,7 @@
control = createStrictControl();
notifier = control.createMock(Notifier.class);
container = control.createMock(DataContainer.class);
- command = new MoveCommand(source, destination);
+ command = new PessMoveCommand(source, destination);
command.initialize(notifier, container);
nodes = new MockNodesFixture();
}
Modified: core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFactoryTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFactoryTest.java 2008-07-15 09:14:04 UTC (rev 6260)
+++ core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFactoryTest.java 2008-07-15 09:35:49 UTC (rev 6261)
@@ -356,7 +356,7 @@
assertEquals(OptimisticTxInterceptor.class, interceptors.next().getClass());
assertEquals(NotificationInterceptor.class, interceptors.next().getClass());
assertEquals(LegacyActivationInterceptor.class, interceptors.next().getClass());
- assertEquals(PassivationInterceptor.class, interceptors.next().getClass());
+ assertEquals(LegacyPassivationInterceptor.class, interceptors.next().getClass());
assertEquals(OptimisticLockingInterceptor.class, interceptors.next().getClass());
assertEquals(OptimisticValidatorInterceptor.class, interceptors.next().getClass());
assertEquals(OptimisticCreateIfNotExistsInterceptor.class, interceptors.next().getClass());
More information about the jbosscache-commits
mailing list