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 9F86E18A60 for ; Wed, 4 Nov 2015 14:10:45 +0000 (UTC) Received: (qmail 44070 invoked by uid 500); 4 Nov 2015 14:10:45 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 43831 invoked by uid 500); 4 Nov 2015 14:10:45 -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 43433 invoked by uid 99); 4 Nov 2015 14:10:45 -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, 04 Nov 2015 14:10:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E5241E1525; Wed, 4 Nov 2015 14:10:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Wed, 04 Nov 2015 14:10:54 -0000 Message-Id: In-Reply-To: <9dd8cd6180f54f459566de0a29319ee6@git.apache.org> References: <9dd8cd6180f54f459566de0a29319ee6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/36] ignite git commit: IGNITE-426 Fix NPE IGNITE-426 Fix NPE Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c787c9de Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c787c9de Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c787c9de Branch: refs/heads/ignite-462-2 Commit: c787c9defe6d170352ac4df902fcd5bb36fe9e52 Parents: 1ee3263 Author: nikolay_tikhonov Authored: Thu Oct 22 20:36:20 2015 +0300 Committer: nikolay_tikhonov Committed: Wed Nov 4 17:02:37 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c787c9de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index b445619..81b81e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -1893,7 +1893,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme null, null, false, - updateIdx0); + updateIdx0 == null ? 0 : updateIdx0); } // Will update something. else { @@ -2060,7 +2060,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme null, null, false, - -1); + updateIdx0 == null ? 0 : updateIdx0); } } @@ -2209,7 +2209,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme null, null, false, - updateIdx0); + updateIdx0 == null ? 0 : updateIdx0); else if (interceptorVal != updated0) { updated0 = cctx.unwrapTemporary(interceptorVal); @@ -2291,7 +2291,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme null, null, false, - updateIdx0); + updateIdx0 == null ? 0 : updateIdx0); } if (writeThrough)