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 709C117940 for ; Mon, 6 Apr 2015 03:19:13 +0000 (UTC) Received: (qmail 71770 invoked by uid 500); 6 Apr 2015 03:19:13 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 71634 invoked by uid 500); 6 Apr 2015 03:19:12 -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 71354 invoked by uid 99); 6 Apr 2015 03:19:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 03:19:10 +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; Mon, 06 Apr 2015 03:18:46 +0000 Received: (qmail 69894 invoked by uid 99); 6 Apr 2015 03:18:43 -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, 06 Apr 2015 03:18:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 863D0E05D6; Mon, 6 Apr 2015 03:18:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 06 Apr 2015 03:18:57 -0000 Message-Id: <071d75d17e854ae2a51623d4e2f93d5d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [15/34] incubator-ignite git commit: # ignite-sprint-3 moved 'isNodeStopping' to SpiAdapter X-Virus-Checked: Checked by ClamAV on apache.org # ignite-sprint-3 moved 'isNodeStopping' to SpiAdapter Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d2d6def5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d2d6def5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d2d6def5 Branch: refs/heads/ignite-564 Commit: d2d6def52dd469869592ee2fd7b9df2a83ba4812 Parents: 3af6914 Author: sboikov Authored: Fri Apr 3 16:14:24 2015 +0300 Committer: sboikov Committed: Fri Apr 3 16:14:24 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +++++++ .../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 6 +++--- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 ------- 3 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2d6def5/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java index bb66872..2bd262c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java @@ -357,6 +357,13 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement } /** + * @return {@code True} if node is stopping. + */ + protected final boolean isNodeStopping() { + return spiCtx.isStopping(); + } + + /** * @return {@code true} if this check is optional. */ private boolean checkOptional() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2d6def5/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index 0ab0cf2..613ff64 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -257,7 +257,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter clients.remove(id, rmv)) { rmv.forceClose(); - if (!getSpiContext().isStopping()) { + if (!isNodeStopping()) { GridNioRecoveryDescriptor recoveryData = ses.recoveryDescriptor(); if (recoveryData != null) { @@ -1460,7 +1460,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter /** {@inheritDoc} */ @Override public void spiStop() throws IgniteSpiException { - assert getSpiContext().isStopping(); + assert isNodeStopping(); unregisterMBean(); @@ -1619,7 +1619,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter GridCommunicationClient client = clients.get(nodeId); if (client == null) { - if (getSpiContext().isStopping()) + if (isNodeStopping()) throw new IgniteSpiException("Node is stopping."); // Do not allow concurrent connects. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2d6def5/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 d5c05f7..cd18370 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,13 +1060,6 @@ 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. */