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 245112009C6 for ; Tue, 31 May 2016 13:55:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 22D35160A45; Tue, 31 May 2016 11:55: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 65877160A44 for ; Tue, 31 May 2016 13:55:28 +0200 (CEST) Received: (qmail 71877 invoked by uid 500); 31 May 2016 11:55:27 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 71864 invoked by uid 99); 31 May 2016 11:55:27 -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; Tue, 31 May 2016 11:55:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 743F2DFB74; Tue, 31 May 2016 11:55:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cschneider@apache.org To: commits@aries.apache.org Message-Id: <54fd50254f744dffa21c2392692cfb1b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: aries-rsa git commit: don't fail if local host cannot be resolved. Closes #3 Date: Tue, 31 May 2016 11:55:27 +0000 (UTC) archived-at: Tue, 31 May 2016 11:55:29 -0000 Repository: aries-rsa Updated Branches: refs/heads/master d79fe5fb5 -> fd85eb256 don't fail if local host cannot be resolved. Closes #3 Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/fd85eb25 Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/fd85eb25 Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/fd85eb25 Branch: refs/heads/master Commit: fd85eb256dee2d2b244973ea44c45ac552dd28a0 Parents: d79fe5f Author: Johannes Utzig Authored: Tue May 31 11:46:34 2016 +0200 Committer: Christian Schneider Committed: Tue May 31 13:54:07 2016 +0200 ---------------------------------------------------------------------- .../aries/rsa/provider/fastbin/tcp/TcpTransport.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/fd85eb25/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransport.java ---------------------------------------------------------------------- diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransport.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransport.java index c46417c..c30af51 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransport.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransport.java @@ -247,11 +247,17 @@ public class TcpTransport implements Transport { } protected String resolveHostName(String host) throws UnknownHostException { - String localName = InetAddress.getLocalHost().getHostName(); - if (localName != null && isUseLocalHost()) { - if (localName.equals(host)) { - return "localhost"; + try { + if(isUseLocalHost()) { + String localName = InetAddress.getLocalHost().getHostName(); + if (localName != null) { + if (localName.equals(host)) { + return "localhost"; + } + } } + } catch (Exception e) { + LOG.warn("Failed to resolve local host address",e); } return host; }