Changeset 14480 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2018-12-01T21:27:53+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #16937 - Support user logins ending by " !"

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1871 +1871 @@
      */
     public static URL betterJarUrl(URL jarUrl) throws IOException {
+        return betterJarUrl(jarUrl, null);
+    }
+
+    /**
+     * Tries to build a better JAR URL if we find it concerned by a JDK bug.
+     * @param jarUrl jar URL to test
+     * @param defaultUrl default URL to return
+     * @return potentially a better URL that won't provoke a JDK bug, or {@code defaultUrl}
+     * @throws IOException if an I/O error occurs
+     * @since 14480
+     */
+    public static URL betterJarUrl(URL jarUrl, URL defaultUrl) throws IOException {
         // Workaround to https://bugs.openjdk.java.net/browse/JDK-4523159
         String urlPath = jarUrl.getPath().replace("%20", " ");
@@ -1888 +1900 @@
             return new URL(jarUrl.getProtocol() + ':' + jarCopy.toUri().toURL().toExternalForm() + urlPath.substring(index));
         }
-        return null;
+        return defaultUrl;
+    }
+
+    /**
+     * Finds a resource with a given name, with robustness to known JDK bugs.
+     * @param klass class on which {@link Class#getResourceAsStream} will be called
+     * @param path name of the desired resource
+     * @return  A {@link java.io.InputStream} object or {@code null} if no resource with this name is found
+     * @since 14480
+     */
+    public static InputStream getResourceAsStream(Class<?> klass, String path) {
+        try {
+            return klass.getResourceAsStream(path);
+        } catch (InvalidPathException e) {
+            Logging.error("Cannot open {0}: {1}", path, e.getMessage());
+            try {
+                URL betterUrl = betterJarUrl(klass.getResource(path));
+                if (betterUrl != null) {
+                    return betterUrl.openStream();
+                }
+            } catch (IOException ex) {
+                Logging.error(ex);
+            }
+            return null;
+        }
     }
 }