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 0FAE217FB3 for ; Tue, 28 Apr 2015 18:11:48 +0000 (UTC) Received: (qmail 43713 invoked by uid 500); 28 Apr 2015 18:11:48 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 43681 invoked by uid 500); 28 Apr 2015 18:11:47 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 43672 invoked by uid 99); 28 Apr 2015 18:11:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 18:11:47 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 18:11:42 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 812DB283F6 for ; Tue, 28 Apr 2015 18:11:09 +0000 (UTC) Received: (qmail 42365 invoked by uid 99); 28 Apr 2015 18:11:09 -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, 28 Apr 2015 18:11:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4EF1EE08E9; Tue, 28 Apr 2015 18:11:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 28 Apr 2015 18:11:23 -0000 Message-Id: <40de017f4b504ec2b069c317832148d6@git.apache.org> In-Reply-To: <99f7529b3a834a7cb8ce638919c98075@git.apache.org> References: <99f7529b3a834a7cb8ce638919c98075@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/50] incubator-ignite git commit: minor X-Virus-Checked: Checked by ClamAV on apache.org minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ade27b41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ade27b41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ade27b41 Branch: refs/heads/ignite-424 Commit: ade27b41e074ee460cbf1718207b47c0a01be072 Parents: bd3a572 Author: Yakov Zhdanov Authored: Tue Apr 28 10:24:19 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Apr 28 10:24:19 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ade27b41/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index f7b29b5..3a1a80a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -826,10 +826,12 @@ public final class GridDhtTxPrepareFuture extends GridCompoundIdentityFutu if (entry.explicitVersion() == null) { GridCacheMvccCandidate added = cached.candidate(version()); - assert added != null || entry.groupLockEntry() : "Null candidate for non-group-lock entry " + - "[added=" + added + ", entry=" + entry + ']'; - assert added == null || added.dhtLocal() : "Got non-dht-local candidate for prepare future" + - "[added=" + added + ", entry=" + entry + ']'; + assert added != null || entry.groupLockEntry() : + "Null candidate for non-group-lock entry " + + "[added=" + added + ", entry=" + entry + ']'; + assert added == null || added.dhtLocal() : + "Got non-dht-local candidate for prepare future " + + "[added=" + added + ", entry=" + entry + ']'; if (added != null && added.ownerVersion() != null) req.owned(entry.txKey(), added.ownerVersion());