http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71b02ccc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71b02ccc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71b02ccc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71b02ccc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java index e9d672e,72769d9..0772e38 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java @@@ -1076,17 -959,8 +991,16 @@@ public abstract class GridCacheIntercep map.put(key3, 3); // Interceptor does not cancel update. - interceptor.retInterceptor = new BeforeRemoveInterceptor(new IgniteBiTuple(false, 999)); + interceptor.retInterceptor = new InterceptorAdapter() { + @Nullable @Override public IgniteBiTuple onBeforeRemove(Cache.Entry entry) { + return new IgniteBiTuple(false, 999); + } + + @Override public void onAfterRemove(Cache.Entry entry) { + //No-op + } + }; - log.info("Batch remove 1: " + op); batchRemove(0, op, map); @@@ -1713,11 -1560,7 +1649,11 @@@ if (disabled) return; + assertNotNull(retInterceptor); + + retInterceptor.onAfterRemove(entry); + - log.info("After remove [key=" + entry.getKey() + ", val=" + entry.getValue() + ']'); + System.out.println("After remove [key=" + entry.getKey() + ", val=" + entry.getValue() + ']'); invokeCnt.incrementAndGet();
