Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 92054 invoked from network); 5 Nov 2009 08:51:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Nov 2009 08:51:02 -0000 Received: (qmail 68388 invoked by uid 500); 5 Nov 2009 08:51:02 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 68329 invoked by uid 500); 5 Nov 2009 08:51:02 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 68320 invoked by uid 99); 5 Nov 2009 08:51:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Nov 2009 08:51:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 05 Nov 2009 08:50:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 99799238890A; Thu, 5 Nov 2009 08:50:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r833022 - in /harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net: InetAddress.java SocketPermission.java Date: Thu, 05 Nov 2009 08:50:29 -0000 To: commits@harmony.apache.org From: regisxu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091105085036.99799238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: regisxu Date: Thu Nov 5 08:50:16 2009 New Revision: 833022 URL: http://svn.apache.org/viewvc?rev=833022&view=rev Log: quick fix for test errors in SecurityManagerTest Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/InetAddress.java harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/SocketPermission.java Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/InetAddress.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/InetAddress.java?rev=833022&r1=833021&r2=833022&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/InetAddress.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/InetAddress.java Thu Nov 5 08:50:16 2009 @@ -507,14 +507,16 @@ */ static native String getHostNameImpl(); - static String getHostNameInternal(String host) throws UnknownHostException { + static String getHostNameInternal(String host, boolean isCheck) throws UnknownHostException { if (host == null || 0 == host.length()) { return InetAddress.LOOPBACK.getHostAddress(); } if (isHostName(host)) { - SecurityManager sm = System.getSecurityManager(); - if (sm != null) { - sm.checkConnect(host, -1); + if (isCheck) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkConnect(host, -1); + } } return lookupHostByName(host).getHostAddress(); } Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/SocketPermission.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/SocketPermission.java?rev=833022&r1=833021&r2=833022&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/SocketPermission.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/SocketPermission.java Thu Nov 5 08:50:16 2009 @@ -159,7 +159,7 @@ } SocketPermission sp = (SocketPermission) other; if (!hostName.equalsIgnoreCase(sp.hostName)) { - if (getIPString() == null || !ipString.equalsIgnoreCase(sp.getIPString())) { + if (getIPString(true) == null || !ipString.equalsIgnoreCase(sp.getIPString(true))) { return false; } } @@ -379,10 +379,10 @@ return actions = sb.substring(1, sb.length()); } - private String getIPString() { + private String getIPString(boolean isCheck) { if (!resolved) { try { - ipString = InetAddress.getHostNameInternal(hostName); + ipString = InetAddress.getHostNameInternal(hostName, isCheck); } catch (UnknownHostException e) { // ignore } @@ -483,7 +483,7 @@ } // The ipString may not be the same, some hosts resolve to // multiple ips - return (getIPString() != null && ipString.equals(sp.getIPString())) + return (getIPString(false) != null && ipString.equals(sp.getIPString(false))) || hostName.equals(sp.hostName); }