Fixed another case of resolve. Checking for "/" and acting accordingly.

edvin · Dec 19, 2018 · cfa70b8 · cfa70b8
1 parent 372d667
commit cfa70b8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/fxlauncher/FXManifest.java b/src/main/java/fxlauncher/FXManifest.java
@@ -65,10 +65,13 @@ public String getFilename() {
 	}
 
 	public URI getFXAppURI() {
-		if (uri.getPath().endsWith("/"))
-			return uri.resolve("app.xml");
+		String appXmlFile = "app.xml";
+		if (!uri.getPath().endsWith("/")) {
+			appXmlFile = "/app.xml";
+		}
 
-		return URI.create(uri.toString() + "/app.xml");
+		// We avoid using resolve here so as to not break UNC paths. See issue #143
+		return URI.create(uri.toString() + appXmlFile);
 	}
 
 	public Path getPath(Path cacheDir) {