Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9180B18FAB for ; Wed, 2 Dec 2015 03:07:34 +0000 (UTC) Received: (qmail 13605 invoked by uid 500); 2 Dec 2015 03:07:34 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 13559 invoked by uid 500); 2 Dec 2015 03:07:34 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 12452 invoked by uid 99); 2 Dec 2015 03:07:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2015 03:07:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 38037E17A1; Wed, 2 Dec 2015 03:07:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Date: Wed, 02 Dec 2015 03:07:56 -0000 Message-Id: <8dea5c3a199142a5bcef1c4071f1edf9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [27/32] ignite git commit: fixed npe fixed npe Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/022cdafe Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/022cdafe Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/022cdafe Branch: refs/heads/ignite-843-rc2 Commit: 022cdafec2f23651c8de82ae7bd9bd5f37999e21 Parents: b274a5c Author: Yakov Zhdanov Authored: Tue Dec 1 16:36:59 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Dec 1 16:36:59 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/022cdafe/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 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 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;