From 97d423a273f5cbb737e95e15cd4cf149e079f524 Mon Sep 17 00:00:00 2001
From: Nicolas Lalevee <hibou@apache.org>
Date: Wed, 22 Aug 2012 13:21:33 +0000
Subject: [PATCH] Don't mess with classloading of the launcher

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1376031 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/launch/Launcher.java | 5 ++---
 src/main/org/apache/tools/ant/launch/Locator.java  | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/org/apache/tools/ant/launch/Launcher.java b/src/main/org/apache/tools/ant/launch/Launcher.java
index d3fdb42c8..4e9612332 100644
--- a/src/main/org/apache/tools/ant/launch/Launcher.java
+++ b/src/main/org/apache/tools/ant/launch/Launcher.java
@@ -25,7 +25,6 @@ import java.util.StringTokenizer;
 import java.util.List;
 import java.util.ArrayList;
 
-import org.apache.tools.ant.util.FileUtils;
 
 
 
@@ -152,7 +151,7 @@ public class Launcher {
                 }
             }
 
-            URL url = FileUtils.getFileUtils().getFileURL(element);
+            URL url = Locator.fileToURL(element);
             if (launchDiag) { System.out.println("adding library URL: " + url) ;}
             libPathURLs.add(url);
         }
@@ -383,7 +382,7 @@ public class Launcher {
             systemJars.length);
 
         if (toolsJar != null) {
-            jars[jars.length - 1] = FileUtils.getFileUtils().getFileURL(toolsJar);
+            jars[jars.length - 1] = Locator.fileToURL(toolsJar);
         }
         return jars;
     }
diff --git a/src/main/org/apache/tools/ant/launch/Locator.java b/src/main/org/apache/tools/ant/launch/Locator.java
index de2f537f3..59f67872e 100644
--- a/src/main/org/apache/tools/ant/launch/Locator.java
+++ b/src/main/org/apache/tools/ant/launch/Locator.java
@@ -405,7 +405,7 @@ public final class Locator {
     @Deprecated
     public static URL fileToURL(File file)
         throws MalformedURLException {
-        return FileUtils.getFileUtils().getFileURL(file);
+        return new URL(file.getAbsoluteFile().toURI().toASCIIString());
     }
 
     /**
@@ -503,7 +503,7 @@ public final class Locator {
             String littlePath = path.toLowerCase(Locale.ENGLISH);
             for (int i = 0; i < extensions.length; ++i) {
                 if (littlePath.endsWith(extensions[i])) {
-                    urls[0] = FileUtils.getFileUtils().getFileURL(location);
+                    urls[0] = fileToURL(location);
                     break;
                 }
             }
@@ -523,7 +523,7 @@ public final class Locator {
             });
         urls = new URL[matches.length];
         for (int i = 0; i < matches.length; ++i) {
-            urls[i] = FileUtils.getFileUtils().getFileURL(matches[i]);
+            urls[i] = fileToURL(matches[i]);
         }
         return urls;
     }