[ISPN-164] (clear() call with Flag.CACHE_MODE_LOCAL going remote) Che…

…ck added to invalidation interceptor so that if forced, clear calls remain local.
infinispan · Aug 19, 2009 · 1d6a943 · 1d6a943
1 parent e3ab62d
commit 1d6a943
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java b/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java
@@ -100,9 +100,11 @@ public Object visitRemoveCommand(InvocationContext ctx, RemoveCommand command) t
 
    @Override
    public Object visitClearCommand(InvocationContext ctx, ClearCommand command) throws Throwable {
-      // just broadcast the clear command - this is simplest!
       Object retval = invokeNextInterceptor(ctx, command);
-      if (ctx.isOriginLocal()) rpcManager.broadcastRpcCommand(command, defaultSynchronous);
+      if (!isLocalModeForced(ctx)) {
+         // just broadcast the clear command - this is simplest!
+         if (ctx.isOriginLocal()) rpcManager.broadcastRpcCommand(command, defaultSynchronous);
+      }
       return retval;
    }
 

diff --git a/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java b/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java
@@ -305,4 +305,17 @@ public void testReplaceWithOldVal() {
       assert cache1.get("key").equals("value1");
       assert cache2.get("key") == null;
    }
+
+   public void testLocalOnlyClear() {
+      cache1.put("key", "value1", Flag.CACHE_MODE_LOCAL);
+      cache2.put("key", "value2", Flag.CACHE_MODE_LOCAL);
+      assert cache1.get("key").equals("value1");
+      assert cache2.get("key").equals("value2");
+
+      cache1.clear(Flag.CACHE_MODE_LOCAL);
+
+      assert cache1.get("key") == null;
+      assert cache2.get("key") != null;
+      assert cache2.get("key").equals("value2");
+   }
 }
diff --git a/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java b/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java
@@ -185,4 +185,17 @@ public void testReplaceWithOldVal() {
       assert cache1.get("key").equals("value1");
       assert cache2.get("key").equals("value1");
    }
+
+   public void testLocalOnlyClear() {
+      cache1.put("key", "value1", Flag.CACHE_MODE_LOCAL);
+      cache2.put("key", "value2", Flag.CACHE_MODE_LOCAL);
+      assert cache1.get("key").equals("value1");
+      assert cache2.get("key").equals("value2");
+
+      cache1.clear(Flag.CACHE_MODE_LOCAL);
+
+      assert cache1.get("key") == null;
+      assert cache2.get("key") != null;
+      assert cache2.get("key").equals("value2");
+   }
 }