ignite-5075
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e88450df Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e88450df Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e88450df Branch: refs/heads/ignite-5075-test1 Commit: e88450df154cda314b7661f54e1e6c916f44d2d1 Parents: f9c34f0 Author: sboikov <sboi...@gridgain.com> Authored: Fri May 19 09:43:52 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri May 19 09:43:52 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheConcurrentMapImpl.java | 3 ++- .../internal/processors/cache/GridCacheLocalConcurrentMap.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e88450df/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java index de69d9c..c0b63f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java @@ -198,8 +198,9 @@ public abstract class GridCacheConcurrentMapImpl implements GridCacheConcurrentM else { if (sizeChange != 0) { assert sizeChange == -1; + assert doomed != null; - decrementPublicSize(cur); + decrementPublicSize(doomed); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e88450df/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java index a0b4f1d..d38b3f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java @@ -75,7 +75,7 @@ public class GridCacheLocalConcurrentMap extends GridCacheConcurrentMapImpl { /** {@inheritDoc} */ @Override public void decrementPublicSize(GridCacheEntryEx e) { - assert e == null || cacheId == e.context().cacheId(); + assert cacheId == e.context().cacheId(); pubSize.decrementAndGet(); }
