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 85316173EC for ; Mon, 20 Apr 2015 15:15:39 +0000 (UTC) Received: (qmail 59425 invoked by uid 500); 20 Apr 2015 15:15:39 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 59396 invoked by uid 500); 20 Apr 2015 15:15:39 -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 59387 invoked by uid 99); 20 Apr 2015 15:15:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 15:15:39 +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.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 15:15:34 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id DBDC243EDA for ; Mon, 20 Apr 2015 15:14:28 +0000 (UTC) Received: (qmail 45334 invoked by uid 99); 20 Apr 2015 15:14:28 -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; Mon, 20 Apr 2015 15:14:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 65724E08DA; Mon, 20 Apr 2015 15:14:28 +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: Mon, 20 Apr 2015 15:15:00 -0000 Message-Id: <87c56a65456d4096b56c59731b2e7550@git.apache.org> In-Reply-To: <4c84cc5685914b80967634d579940be6@git.apache.org> References: <4c84cc5685914b80967634d579940be6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/50] incubator-ignite git commit: sp-3-p1 minor X-Virus-Checked: Checked by ClamAV on apache.org sp-3-p1 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/54390af4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/54390af4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/54390af4 Branch: refs/heads/gg-10115 Commit: 54390af4d3fdf7941f570e51f0f6d3fa417fa69d Parents: ba96cba Author: Yakov Zhdanov Authored: Fri Apr 17 16:28:12 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Apr 17 16:28:12 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/managers/discovery/GridDiscoveryManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54390af4/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 3ad1594..1c70fb2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -912,7 +912,8 @@ public class GridDiscoveryManager extends GridManagerAdapter { } if (!locJoinEvt.isDone()) - locJoinEvt.onDone(new IgniteCheckedException("Failed to wait for local node joined event (grid is stopping).")); + locJoinEvt.onDone( + new IgniteCheckedException("Failed to wait for local node joined event (grid is stopping).")); } /** {@inheritDoc} */