Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 65500 invoked from network); 2 Sep 2008 02:32:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Sep 2008 02:32:06 -0000 Received: (qmail 92457 invoked by uid 500); 2 Sep 2008 02:32:04 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 92434 invoked by uid 500); 2 Sep 2008 02:32:04 -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 92425 invoked by uid 99); 2 Sep 2008 02:32:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 19:32:04 -0700 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; Tue, 02 Sep 2008 02:31:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 58FFC238899C; Mon, 1 Sep 2008 19:31:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691095 - in /harmony/enhanced/classlib/trunk/modules/luni/src: main/java/java/io/File.java test/api/windows/org/apache/harmony/luni/tests/java/io/WinFileTest.java Date: Tue, 02 Sep 2008 02:31:15 -0000 To: commits@harmony.apache.org From: qiuxx@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080902023115.58FFC238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: qiuxx Date: Mon Sep 1 19:31:14 2008 New Revision: 691095 URL: http://svn.apache.org/viewvc?rev=691095&view=rev Log: Apply for HARMONY-5961 with minor modification, ([classlib][luni]File.toURI() returns incorrect UNC uri) Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java harmony/enhanced/classlib/trunk/modules/luni/src/test/api/windows/org/apache/harmony/luni/tests/java/io/WinFileTest.java Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java?rev=691095&r1=691094&r2=691095&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java Mon Sep 1 19:31:14 2008 @@ -1279,7 +1279,7 @@ name.length() + 1).append('/').append(name).toString(), null, null); } else if (name.startsWith("//")) { - return new URI("file", name, null); // UNC path + return new URI("file", "", name, null); // UNC path } return new URI("file", null, name, null, null); } catch (URISyntaxException e) { Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/windows/org/apache/harmony/luni/tests/java/io/WinFileTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/windows/org/apache/harmony/luni/tests/java/io/WinFileTest.java?rev=691095&r1=691094&r2=691095&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/windows/org/apache/harmony/luni/tests/java/io/WinFileTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/windows/org/apache/harmony/luni/tests/java/io/WinFileTest.java Mon Sep 1 19:31:14 2008 @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.net.URI; import tests.support.resource.Support_Resources; @@ -123,4 +124,13 @@ assertEquals("Invalid content was red", CONTENT, wasRed); } + /** + * @test java.io.File#toURI() + */ + public void test_toURI_UNC() throws Exception { + File f = new File("\\\\unchost\\[dir]\\file.txt"); + assertNotNull(f.toURI()); + assertEquals("incorrect URI for UNC path: " + f.toURI(), f.toURI(), + new URI("file:////unchost/%5Bdir%5D/file.txt")); + } }