make canonical versions of files...

1 files changed, 11 insertions, 3 deletions

diff --git a/util/src/org/aspectj/util/ConfigParser.java b/util/src/org/aspectj/util/ConfigParser.java
index 0c3ea1e2e..36ed31edc 100644
--- a/util/src/org/aspectj/util/ConfigParser.java
+++ b/util/src/org/aspectj/util/ConfigParser.java
@@ -205,11 +205,19 @@ public class ConfigParser {
         return makeFile(getCurrentDir(), name);
     }
 
-    protected File makeFile(File dir, String name) {
+    private File makeFile(File dir, String name) {
         name = name.replace('/', File.separatorChar);
         File ret = new File(name);
-        if (dir == null || ret.isAbsolute()) return ret;
-        return new File(dir, name);
+        if (dir != null && !ret.isAbsolute()) { 
+          ret = new File(dir, name);
+        }
+        try {
+        	ret = ret.getCanonicalFile();
+        } catch (IOException ioEx) {
+        	// proceed without canonicalization
+        	// so nothing to do here
+        }
+        return ret;
     }