Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 78297200C85 for ; Mon, 24 Apr 2017 17:03:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 76F54160BBB; Mon, 24 Apr 2017 15:03:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 67C1D160B99 for ; Mon, 24 Apr 2017 17:03:27 +0200 (CEST) Received: (qmail 15667 invoked by uid 500); 24 Apr 2017 15:03:26 -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 14595 invoked by uid 99); 24 Apr 2017 15:03:25 -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, 24 Apr 2017 15:03:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C8B1FE152F; Mon, 24 Apr 2017 15:03:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 24 Apr 2017 15:04:03 -0000 Message-Id: <4be6ef064cea47b694fca7a17a58d94d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [40/50] [abbrv] ignite git commit: ignite-3054 - Fix closuing server channel archived-at: Mon, 24 Apr 2017 15:03:29 -0000 ignite-3054 - Fix closuing server channel Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/229880c6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/229880c6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/229880c6 Branch: refs/heads/ignite-3054 Commit: 229880c6516dd8a033291863aa14e5d23f59d9b9 Parents: 698728b Author: dkarachentsev Authored: Thu Dec 15 13:20:02 2016 +0300 Committer: dkarachentsev Committed: Thu Dec 15 13:20:02 2016 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/229880c6/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 8af1e91..a0c862b 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 @@ -5616,7 +5616,12 @@ class ServerImpl extends TcpDiscoveryImpl { } // If free port wasn't found. - U.closeQuiet(srvCh); + try { + srvCh.close(); + } + catch (IOException e) { + log.error("Unable close channel ", e); + } } throw new IgniteSpiException("Failed to bind TCP server socket (possibly all ports in range " + @@ -5636,6 +5641,8 @@ class ServerImpl extends TcpDiscoveryImpl { srvCh.setOption(StandardSocketOptions.SO_REUSEADDR, true); } catch (IOException e) { + U.closeQuiet(srvCh); + throw new IgniteSpiException("Failed to open socket channel", e); } }