fixed npe (cherry picked from commit 022cdaf)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7e2dfa50 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7e2dfa50 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7e2dfa50 Branch: refs/heads/ignite-2093 Commit: 7e2dfa504c5e95ff011d8a5c1f11a479ce826303 Parents: a58c75f Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Dec 1 16:36:59 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Dec 1 16:40:23 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/near/GridNearGetFuture.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7e2dfa50/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index 3f61b2f..9705569 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -264,11 +264,13 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap if (!success) { GridCacheVersion obsolete = cctx.versions().next(topVer); - for (GridNearCacheEntry reserved : savedEntries.values()) { - reserved.releaseEviction(); + if (savedEntries != null) { + for (GridNearCacheEntry reserved : savedEntries.values()) { + reserved.releaseEviction(); - if (reserved.markObsolete(obsolete)) - reserved.context().cache().removeEntry(reserved); + if (reserved.markObsolete(obsolete)) + reserved.context().cache().removeEntry(reserved); + } } } } @@ -543,7 +545,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap } else { K key0 = (K)cctx.unwrapPortableIfNeeded(key, !deserializePortable, false); - V val0 = !skipVals ? + V val0 = !skipVals ? (V)cctx.unwrapPortableIfNeeded(v, !deserializePortable, false) : (V)Boolean.TRUE;
