Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-4-tests 2d53eeace -> 4c57b2217
#ignite-sprint-4-tests: debug query tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4c57b221 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4c57b221 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4c57b221 Branch: refs/heads/ignite-sprint-4-tests Commit: 4c57b2217eaaa70e1e83e6b8d47ca8adacf0ceaf Parents: 2d53eea Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Apr 21 10:18:45 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Apr 21 10:18:45 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtLocalPartition.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c57b221/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 035d717..1ed71bb 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 @@ -207,9 +207,7 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition> assert state != EVICTED : "Adding entry to invalid partition: " + this; - map.put(entry.key(), entry); - - if (!entry.isInternal()) + if (map.put(entry.key(), entry) == null && !entry.isInternal()) mapPubSize.increment(); } @@ -222,17 +220,9 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition> // Make sure to remove exactly this entry. synchronized (entry) { - if (map.containsKey(entry.key()) - && map.remove(entry.key(), entry) - && !entry.isInternal() - && !entry.deleted()) { - System.out.println("DELETED ENTRY " + entry.key().value(cctx.cacheObjectContext(), true)); - mapPubSize.decrement(); - - int l = mapPubSize.intValue(); - if (l < 0) { - System.out.println("DELETED ENRTY TWO TIMES " + entry.key().value(cctx.cacheObjectContext(), true)); - } + if (map.remove(entry.key(), entry)) { + if (!entry.isInternal() && !entry.deleted()) + mapPubSize.decrement(); } }
