Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 92290 invoked from network); 3 Aug 2006 09:17:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Aug 2006 09:17:35 -0000 Received: (qmail 59634 invoked by uid 500); 3 Aug 2006 09:17:35 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 59605 invoked by uid 500); 3 Aug 2006 09:17:35 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 59594 invoked by uid 99); 3 Aug 2006 09:17:34 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Aug 2006 02:17:34 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Aug 2006 02:17:34 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 51B311A981A; Thu, 3 Aug 2006 02:17:14 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r428290 - /incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLStreamHandler.java Date: Thu, 03 Aug 2006 09:17:13 -0000 To: harmony-commits@incubator.apache.org From: pyang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060803091714.51B311A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pyang Date: Thu Aug 3 02:17:13 2006 New Revision: 428290 URL: http://svn.apache.org/viewvc?rev=428290&view=rev Log: Roll back the modification of r428264, because it cause two test failures of security module Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLStreamHandler.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLStreamHandler.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLStreamHandler.java?rev=428290&r1=428289&r2=428290&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLStreamHandler.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLStreamHandler.java Thu Aug 3 02:17:13 2006 @@ -374,17 +374,10 @@ * false if the hosts are different */ protected boolean hostsEqual(URL url1, URL url2) { - String host1 = url1.getHost(), host2 = url2.getHost(); - if (host1 == host2 || (host1 != null && host1.equalsIgnoreCase(host2))) { - return true; - } - InetAddress addr1 = getHostAddress(url1); - InetAddress addr2 = getHostAddress(url2); - if (addr1 == addr2 || (null != addr1 && addr1.equals(addr2))) { - return true; - } - return false; - } + String host1 = url1.getHost(), host2 = url2.getHost(); + return host1 == host2 + || (host1 != null && host1.equalsIgnoreCase(host2)); + } /** * Answers true if the urls refer to the same file. Compares the protocol,