From derby-commits-return-14965-apmail-db-derby-commits-archive=db.apache.org@db.apache.org Fri Oct 14 19:17:25 2011 Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 724CE7E08 for ; Fri, 14 Oct 2011 19:17:25 +0000 (UTC) Received: (qmail 87844 invoked by uid 500); 14 Oct 2011 19:17:25 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 87795 invoked by uid 500); 14 Oct 2011 19:17:24 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 87788 invoked by uid 99); 14 Oct 2011 19:17:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Oct 2011 19:17:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Oct 2011 19:17:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A250223888FE; Fri, 14 Oct 2011 19:17:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1183463 - /db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Date: Fri, 14 Oct 2011 19:17:03 -0000 To: derby-commits@db.apache.org From: rhillegas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111014191703.A250223888FE@eris.apache.org> Author: rhillegas Date: Fri Oct 14 19:17:03 2011 New Revision: 1183463 URL: http://svn.apache.org/viewvc?rev=1183463&view=rev Log: DERBY-5456: Make the network server more diligent about collecting up all of the local addresses which it can. Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1183463&r1=1183462&r2=1183463&view=diff ============================================================================== --- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original) +++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Fri Oct 14 19:17:03 2011 @@ -2641,20 +2641,24 @@ public final class NetworkServerControlI **/ private void buildLocalAddressList(InetAddress bindAddr) { - localAddresses = new ArrayList(3); - localAddresses.add(bindAddr); - try { - localAddresses.add(InetAddress.getLocalHost()); - localAddresses.add(InetAddress.getByName("localhost")); - }catch(UnknownHostException uhe) - { - try { - consolePropertyMessage("DRDA_UnknownHostWarning.I",uhe.getMessage()); - } catch (Exception e) - { // just a warning shouldn't actually throw an exception - } - } + localAddresses = new ArrayList(3); + localAddresses.add(bindAddr); + + try { localAddresses.add(InetAddress.getLocalHost()); } + catch(UnknownHostException uhe) { unknownHostException( uhe ); } + + try { localAddresses.add(InetAddress.getByName("localhost")); } + catch(UnknownHostException uhe) { unknownHostException( uhe ); } } + private void unknownHostException( Throwable t ) + { + try { + consolePropertyMessage( "DRDA_UnknownHostWarning.I", t.getMessage() ); + } catch (Exception e) + { + // just a warning shouldn't actually throw an exception + } + } /** * Routines for writing commands for NetworkServerControlImpl being used as a client