FileToURL via URI

diff --git a/util/src/org/aspectj/util/FileUtil.java b/util/src/org/aspectj/util/FileUtil.java
index 8745750c5408ae1572301590f9cb9dbe2ee9459a..2d2a90e0edc4f9e399b5c407d6aad6c8319188e1 100644 (file)
--- a/util/src/org/aspectj/util/FileUtil.java
+++ b/util/src/org/aspectj/util/FileUtil.java
@@ -879,7 +879,11 @@ public class FileUtil {
                LangUtil.throwIaxIfNull(file, "file");
         URL result = null;
         try {
-           String url =  "file:" + file.getAbsolutePath().replace('\\', '/');
+            result = file.toURI().toURL();
+            if (null != result) {
+                return result;
+            }
+            String url =  "file:" + file.getAbsolutePath().replace('\\', '/');
             result = new URL(url + (file.isDirectory() ? "/" : ""));
         } catch (MalformedURLException e) {
             String m = "Util.makeURL(\"" + file.getPath() + "\" MUE " + e.getMessage();
@@ -1349,6 +1353,7 @@ public class FileUtil {
             try {
                 final int MAX = 4096;
                 byte[] buf = new byte[MAX];
+                // TODO this blocks, hanging the harness
                 int count = in.read(buf, 0, MAX);
                 ByteArrayOutputStream mySnoop;
                 while ((halt && finishStream && (0 < count))