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 B300E18D91 for ; Thu, 26 Nov 2015 18:50:20 +0000 (UTC) Received: (qmail 58485 invoked by uid 500); 26 Nov 2015 18:50:20 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 58297 invoked by uid 500); 26 Nov 2015 18:50:20 -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 57796 invoked by uid 99); 26 Nov 2015 18:50:19 -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; Thu, 26 Nov 2015 18:50:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB7DDE2C50; Thu, 26 Nov 2015 18:50:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 26 Nov 2015 18:50:33 -0000 Message-Id: <4f83fe246594465b94d760f24381824a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [15/15] ignite git commit: ignite-1537 ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cbbb17d3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cbbb17d3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cbbb17d3 Branch: refs/heads/ignite-1537 Commit: cbbb17d3d69d86ec7aa8ad132408c159a0f7ce54 Parents: a293f9b Author: sboikov Authored: Thu Nov 26 21:49:22 2015 +0300 Committer: sboikov Committed: Thu Nov 26 21:49:22 2015 +0300 ---------------------------------------------------------------------- .../near/GridNearOptimisticTxPrepareFuture.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cbbb17d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index 61f297e..5f509ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@ -47,6 +47,7 @@ import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.CI1; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.P1; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; @@ -576,15 +577,18 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa @Override public String toString() { Collection futs = F.viewReadOnly(futures(), new C1, String>() { @Override public String apply(IgniteInternalFuture f) { - return "[node=" + ((MiniFuture)f).node().id() + - ", loc=" + ((MiniFuture)f).node().isLocal() + - ", done=" + f.isDone() + "]"; + return "[node=" + ((MiniFuture) f).node().id() + + ", loc=" + ((MiniFuture) f).node().isLocal() + + ", done=" + f.isDone() + "]"; + } + }, new P1>() { + @Override public boolean apply(IgniteInternalFuture fut) { + return isMini(fut); } }); return S.toString(GridNearOptimisticTxPrepareFuture.class, this, "innerFuts", futs, - "keyLockFut", keyLockFut, "tx", tx, "super", super.toString()); }