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 D898017E70 for ; Wed, 1 Apr 2015 14:45:27 +0000 (UTC) Received: (qmail 96085 invoked by uid 500); 1 Apr 2015 14:45:27 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 96053 invoked by uid 500); 1 Apr 2015 14:45:26 -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 96044 invoked by uid 99); 1 Apr 2015 14:45:26 -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 14:45:26 +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 14:45:04 +0000 Received: (qmail 87029 invoked by uid 99); 1 Apr 2015 14:44:58 -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 14:44:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E2FAFE05DF; Wed, 1 Apr 2015 14:44:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 01 Apr 2015 14:44:57 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-ignite git commit: sp-3 X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-3 633396636 -> efd98ba01 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/22688754 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/22688754 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/22688754 Branch: refs/heads/ignite-sprint-3 Commit: 226887545372403f1042f163360e0ee9066e2a12 Parents: 6413426 Author: Yakov Zhdanov Authored: Wed Apr 1 17:44:38 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Apr 1 17:44:38 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22688754/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 74a070f..d5c05f7 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 @@ -1060,6 +1060,13 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov } /** + * @return {@code True} if node is stopping. + */ + private boolean isNodeStopping() { + return super.getSpiContext().isStopping(); + } + + /** * @throws IgniteSpiException If any error occurs. * @return {@code true} if IP finder contains local address. */ @@ -4695,7 +4702,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov // Ping. if (msg instanceof TcpDiscoveryPingRequest) { - if (ctxInitLatch.getCount() > 0 || !getSpiContext().isStopping()) { + if (!isNodeStopping()) { TcpDiscoveryPingRequest req = (TcpDiscoveryPingRequest)msg; TcpDiscoveryPingResponse res = new TcpDiscoveryPingResponse(locNodeId);