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 3595918272 for ; Mon, 23 Nov 2015 08:46:06 +0000 (UTC) Received: (qmail 37379 invoked by uid 500); 23 Nov 2015 08:46:05 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 37269 invoked by uid 500); 23 Nov 2015 08:46:05 -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 36819 invoked by uid 99); 23 Nov 2015 08:46:05 -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, 23 Nov 2015 08:46:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3A885E0435; Mon, 23 Nov 2015 08:46:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Mon, 23 Nov 2015 08:46:15 -0000 Message-Id: <3f8c482e37e14820b3dbe0664ee5746c@git.apache.org> In-Reply-To: <991ea5c1a2bc4bf0a84b3358f58b79bc@git.apache.org> References: <991ea5c1a2bc4bf0a84b3358f58b79bc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/30] ignite git commit: IGNITE-1911: hot fix for the situation when a reference to Ignite instance may be set to null IGNITE-1911: hot fix for the situation when a reference to Ignite instance may be set to null Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/281b2775 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/281b2775 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/281b2775 Branch: refs/heads/ignite-1753-1282 Commit: 281b27755394073881194e9ad1f0aa219c14d22e Parents: f89347f Author: dmagda Authored: Sat Nov 21 00:53:22 2015 +0300 Committer: dmagda Committed: Sat Nov 21 00:53:22 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/281b2775/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index ae3c8cb..82e476c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -2169,7 +2169,7 @@ class ServerImpl extends TcpDiscoveryImpl { new Thread(new Runnable() { @Override public void run() { try { - spi.ignite().close(); + ignite.close(); U.log(log, "Stopped the grid successfully in response to TcpDiscoverySpi's " + "message worker thread abnormal termination.");