Changeset 14406 in josm for trunk/src/org/openstreetmap/josm/data/Version.java

Timestamp:

2018-11-03T01:07:53+01:00 (5 years ago)

Author:

Don-vip

Message:

see #16937 - Support user logins with space character on Java 11 (JOSM startup)

File:

• trunk/src/org/openstreetmap/josm/data/Version.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Version.java

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.InvalidPathException;
 import java.util.Map.Entry;
 import java.util.Optional;
@@ -105 +107 @@
      */
     public void init() {
-        try (InputStream stream = Version.class.getResourceAsStream("/REVISION")) {
+        try (InputStream stream = openRevisionStream("/REVISION")) {
             if (stream == null) {
                 Logging.warn(tr("The revision file ''/REVISION'' is missing."));
@@ -118 +120 @@
     }
 
+    private static InputStream openRevisionStream(String path) throws IOException {
+        try {
+            return Version.class.getResourceAsStream(path);
+        } catch (InvalidPathException e) {
+            Logging.error("Cannot open {0}: {1}", path, e.getMessage());
+            URL betterUrl = Utils.betterJarUrl(Version.class.getResource(path));
+            if (betterUrl != null) {
+                return betterUrl.openStream();
+            }
+            return null;
+        }
+    }
+
     /**
      * Replies the version string. Either the SVN revision "1234" (as string) or the