IGNITE-136 Fixed review notes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3a466e8c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3a466e8c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3a466e8c Branch: refs/heads/ignite-237 Commit: 3a466e8cbdbde90bbc4debb5f9b998621e2804e7 Parents: 75ba3e4 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Feb 26 13:03:07 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Feb 26 13:03:07 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/dht/GridDhtCacheEntry.java | 3 +++ .../processors/cache/distributed/dht/GridDhtLocalPartition.java | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a466e8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java index cf4f5df..c331b99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java @@ -563,6 +563,9 @@ public class GridDhtCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { log.debug("Entry has been cleared from swap storage: " + this); } + if (cctx.store().isLocalStore()) + cctx.store().removeFromStore(null, key()); + rmv = true; return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a466e8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java index e3efade..29f7363 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java @@ -536,8 +536,6 @@ public class GridDhtLocalPartition<K, V> implements Comparable<GridDhtLocalParti boolean rec = cctx.events().isRecordable(EVT_CACHE_PRELOAD_OBJECT_UNLOADED); - boolean isLocStore = cctx.store().isLocalStore(); - for (Iterator<GridDhtCacheEntry<K, V>> it = map.values().iterator(); it.hasNext();) { GridDhtCacheEntry<K, V> cached = it.next(); @@ -545,9 +543,6 @@ public class GridDhtLocalPartition<K, V> implements Comparable<GridDhtLocalParti if (cached.clearInternal(clearVer, swap)) { it.remove(); - if (isLocStore) - cctx.store().removeFromStore(null, cached.key()); - if (!cached.isInternal()) { mapPubSize.decrement();
