Return-Path: X-Original-To: apmail-ant-notifications-archive@minotaur.apache.org Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 235BD97D7 for ; Wed, 22 Aug 2012 12:32:44 +0000 (UTC) Received: (qmail 24492 invoked by uid 500); 22 Aug 2012 12:32:43 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 24458 invoked by uid 500); 22 Aug 2012 12:32:43 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 24449 invoked by uid 99); 22 Aug 2012 12:32:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Aug 2012 12:32:43 +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; Wed, 22 Aug 2012 12:32:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8AD3723889B3 for ; Wed, 22 Aug 2012 12:31:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1376014 - /ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java Date: Wed, 22 Aug 2012 12:31:57 -0000 To: notifications@ant.apache.org From: hibou@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120822123157.8AD3723889B3@eris.apache.org> Author: hibou Date: Wed Aug 22 12:31:57 2012 New Revision: 1376014 URL: http://svn.apache.org/viewvc?rev=1376014&view=rev Log: To make an URL of a file, use FileUtils.getFileURL, which seems to do the job correctly Modified: ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java Modified: ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java?rev=1376014&r1=1376013&r2=1376014&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java Wed Aug 22 12:31:57 2012 @@ -27,6 +27,8 @@ import java.text.CharacterIterator; import java.text.StringCharacterIterator; import java.util.Locale; +import org.apache.tools.ant.util.FileUtils; + // CheckStyle:LineLengthCheck OFF - urls are long! /** * The Locator is a utility class which is used to find certain items @@ -401,11 +403,7 @@ public final class Locator { */ public static URL fileToURL(File file) throws MalformedURLException { - try { - return new URL(encodeURI(file.toURL().toString())); - } catch (UnsupportedEncodingException ex) { - throw new MalformedURLException(ex.toString()); - } + return FileUtils.getFileUtils().getFileURL(file); } /**