Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7F91B2009A8 for ; Tue, 17 May 2016 15:48:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7E4D8160A20; Tue, 17 May 2016 13:48:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AB29B160A25 for ; Tue, 17 May 2016 15:48:44 +0200 (CEST) Received: (qmail 5754 invoked by uid 500); 17 May 2016 13:48:43 -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 5729 invoked by uid 99); 17 May 2016 13:48:43 -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; Tue, 17 May 2016 13:48:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 687CFDFABB; Tue, 17 May 2016 13:48:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.apache.org Date: Tue, 17 May 2016 13:48:47 -0000 Message-Id: <7afaa0dcdfd4434ca7e3f00438146d2b@git.apache.org> In-Reply-To: <8d2a39bf617d4bdbb70aa2fe88c5c62b@git.apache.org> References: <8d2a39bf617d4bdbb70aa2fe88c5c62b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/14] ignite git commit: ignite-1.6 Fixed NPE in GridDhtTxFinishFuture.onDone archived-at: Tue, 17 May 2016 13:48:45 -0000 ignite-1.6 Fixed NPE in GridDhtTxFinishFuture.onDone Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/21daa23c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/21daa23c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/21daa23c Branch: refs/heads/master Commit: 21daa23ce0d1bdb1e1e28247aac7cd29ece5c898 Parents: e5c8dfe Author: sboikov Authored: Tue May 17 11:09:21 2016 +0300 Committer: sboikov Committed: Tue May 17 11:09:50 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/dht/GridDhtTxFinishFuture.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/21daa23c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java index ebda52c..de04782 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java @@ -218,7 +218,7 @@ public final class GridDhtTxFinishFuture extends GridCompoundIdentityFutur if (finishErr == null) finishErr = this.tx.commitError(); - if (tx.syncMode() != PRIMARY_SYNC) + if (this.tx.syncMode() != PRIMARY_SYNC) this.tx.sendFinishReply(commit, finishErr); // Don't forget to clean up.