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 F17421734E for ; Wed, 1 Apr 2015 15:23:56 +0000 (UTC) Received: (qmail 64165 invoked by uid 500); 1 Apr 2015 15:23:22 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 64124 invoked by uid 500); 1 Apr 2015 15:23:22 -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 64065 invoked by uid 99); 1 Apr 2015 15:23:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2015 15:23:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 01 Apr 2015 15:22:53 +0000 Received: (qmail 59087 invoked by uid 99); 1 Apr 2015 15:22:44 -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, 01 Apr 2015 15:22:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 06FFBE2F22; Wed, 1 Apr 2015 15:22:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 01 Apr 2015 15:23:25 -0000 Message-Id: <4d3370b5cf644bd0ae4b1c35aa302099@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [43/50] incubator-ignite git commit: sp-3 X-Virus-Checked: Checked by ClamAV on apache.org sp-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/39cfcbdf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39cfcbdf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39cfcbdf Branch: refs/heads/ignite-gg-10002 Commit: 39cfcbdf68a20aad45fd8f5802f2f1d78a16e6ea Parents: 091369c Author: Yakov Zhdanov Authored: Wed Apr 1 16:26:10 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Apr 1 16:26:10 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39cfcbdf/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index 02d373c..74a070f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -4695,7 +4695,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov // Ping. if (msg instanceof TcpDiscoveryPingRequest) { - if (!getSpiContext().isStopping()) { + if (ctxInitLatch.getCount() > 0 || !getSpiContext().isStopping()) { TcpDiscoveryPingRequest req = (TcpDiscoveryPingRequest)msg; TcpDiscoveryPingResponse res = new TcpDiscoveryPingResponse(locNodeId);