#ignite-565: Revert changes in GridDistributedCacheAdapter.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2b788cc5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2b788cc5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2b788cc5 Branch: refs/heads/ignite-611 Commit: 2b788cc5b2c5e3de3767559bf8c689437f92d011 Parents: 1a07868 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Mar 26 14:48:48 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Mar 26 14:48:48 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/GridDistributedCacheAdapter.java | 4 +++- .../processors/cache/GridCacheInterceptorAbstractSelfTest.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2b788cc5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java index 031bca6..9742004 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java @@ -295,8 +295,10 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter for (GridDhtLocalPartition locPart : dht.topology().currentLocalPartitions()) { if (!locPart.isEmpty() && locPart.primary(topVer)) { - for (GridDhtCacheEntry o : locPart.entries()) + for (GridDhtCacheEntry o : locPart.entries()) { + if (!o.obsoleteOrDeleted()) dataLdr.removeDataInternal(o.key()); + } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2b788cc5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git 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 index eae7324..ae6c5e1 100644 --- 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 @@ -1335,7 +1335,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst * @param expVal Expected value. * @throws Exception If failed. */ - private void checkCacheValue(String key, @Nullable Object expVal) throws Exception { + private void checkCacheValue(Object key, @Nullable Object expVal) throws Exception { interceptor.disabled = true; if (storeEnabled())
