[bugfix] Normalize paths

eXist-db · Jul 13, 2016 · b487ea7 · b487ea7
1 parent 2f5038d
commit b487ea7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/org/exist/start/Main.java b/src/org/exist/start/Main.java
@@ -501,7 +501,7 @@ public Path detectHome() {
 
             if (Files.isReadable(jar)) {
                 try {
-                    _home_dir = Paths.get(".").toAbsolutePath();
+                    _home_dir = Paths.get(".").normalize().toAbsolutePath();
                 } catch (final InvalidPathException e) {
                     // ignore
                 }
@@ -510,7 +510,7 @@ public Path detectHome() {
 
         if (_home_dir == null) {
             // failed: try ../exist.jar
-            final Path jar = Paths.get("..").resolve("exist.jar");
+            final Path jar = Paths.get("..").resolve("exist.jar").normalize();
             if (_debug) {
                 System.err.println("trying " + jar.toAbsolutePath());
             }
@@ -542,7 +542,7 @@ public Path detectHome() {
 
         if (_home_dir == null) {
             // try ../conf.xml
-            final Path jar = Paths.get("..").resolve("conf.xml");
+            final Path jar = Paths.get("..").resolve("conf.xml").normalize();
             if (_debug) {
                 System.err.println("trying " + jar.toAbsolutePath());
             }