Repository: ignite Updated Branches: refs/heads/ignite-5075 838f64718 -> 837b790b9
ignite-5075 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/837b790b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/837b790b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/837b790b Branch: refs/heads/ignite-5075 Commit: 837b790b92abf0c82fcb6e02e02e4421e3ee0ff5 Parents: 838f647 Author: sboikov <[email protected]> Authored: Tue May 16 18:17:08 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue May 16 18:17:08 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheGroupInfrastructure.java | 8 ++++---- .../processors/cache/GridCacheLocalConcurrentMap.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/837b790b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java index 62add3f..e06b627 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java @@ -517,8 +517,7 @@ public class CacheGroupInfrastructure { * */ public void onKernalStop() { - if (preldr != null) // null for LOCAL cache. - preldr.onKernalStop(); + preldr.onKernalStop(); offheapMgr.onKernalStop(); } @@ -615,6 +614,8 @@ public class CacheGroupInfrastructure { preldr.start(); } + else + preldr = new GridCachePreloaderAdapter(this); // TODO IGNITE-5075 get from plugin. offheapMgr = new IgniteCacheOffheapManagerImpl(); @@ -706,7 +707,6 @@ public class CacheGroupInfrastructure { if (top != null) top.onReconnected(); - if (preldr != null) - preldr.onReconnected(); + preldr.onReconnected(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/837b790b/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 d38b3f1..a0b4f1d 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 cacheId == e.context().cacheId(); + assert e == null || cacheId == e.context().cacheId(); pubSize.decrementAndGet(); }
