gg-12686 : Fixed null CacheMapHolder if node is restarted with partition in RENTING state.
Signed-off-by: Andrey Gura <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d253c024 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d253c024 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d253c024 Branch: refs/heads/ignite-5896 Commit: d253c02496f54ce4669fe19fefcf5856fa48d08e Parents: faa156f Author: Ilya Lantukh <[email protected]> Authored: Wed Aug 30 16:58:32 2017 +0300 Committer: Andrey Gura <[email protected]> Committed: Wed Aug 30 17:56:22 2017 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtLocalPartition.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d253c024/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 4d1bb38..f0e0d47 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 @@ -932,12 +932,8 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements try { CacheDataRow row = it0.next(); - if (grp.sharedGroup() && (hld == null || hld.cctx.cacheId() != row.cacheId())) { - hld = cacheMaps.get(row.cacheId()); - - if (hld == null) - continue; - } + if (grp.sharedGroup() && (hld == null || hld.cctx.cacheId() != row.cacheId())) + hld = cacheMapHolder(ctx.cacheContext(row.cacheId())); assert hld != null;
