gg-12686 : Fixed null CacheMapHolder if node is restarted with partition in RENTING state.
Signed-off-by: Andrey Gura <ag...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/01c627a0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/01c627a0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/01c627a0 Branch: refs/heads/ignite-6181-1 Commit: 01c627a0a36692a045a646d4d165820bb3b7cf04 Parents: 6c45ede Author: Ilya Lantukh <ilant...@gridgain.com> Authored: Wed Aug 30 16:58:32 2017 +0300 Committer: Andrey Gura <ag...@apache.org> Committed: Wed Aug 30 17:39:05 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/01c627a0/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;
