Changeset 13356 in josm for trunk

Timestamp:

2018-01-26T21:37:00+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15662 - allow JOSM to open JAR URLs containing exclamation marks (workaround to ​https://bugs.openjdk.java.net/browse/JDK-4523159)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MainApplication.java (modified) (3 diffs)
• io/OsmServerReader.java (modified) (1 diff)
• tools/I18n.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (1 diff)
• tools/Utils.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -156 +156 @@
 import org.openstreetmap.josm.tools.FontsManager;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -955 +954 @@
             for (String i : args.get(Option.LOAD_PREFERENCES)) {
                 Logging.info("Reading preferences from " + i);
-                try (InputStream is = openStream(new URL(i))) {
+                try (InputStream is = Utils.openStream(new URL(i))) {
                     config.openAndReadXML(is);
                 } catch (IOException ex) {
@@ -1206 +1205 @@
                 }
             }
-        }
-    }
-
-    private static InputStream openStream(URL url) throws IOException {
-        if ("file".equals(url.getProtocol())) {
-            return url.openStream();
-        } else {
-            return HttpClient.create(url).connect().getContent();
         }
     }

trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -164 +164 @@
             }
 
-            if ("file".equals(url.getProtocol())) {
+            String protocol = url.getProtocol();
+            if ("file".equals(protocol) || "jar".equals(protocol)) {
                 try {
-                    return url.openStream();
+                    return Utils.openStream(url);
                 } catch (IOException e) {
                     throw new OsmTransferException(e);

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

@@ -419 +419 @@
         }
         try (
-            InputStream enStream = en.openStream();
-            InputStream trStream = tr.openStream()
+            InputStream enStream = Utils.openStream(en);
+            InputStream trStream = Utils.openStream(tr)
         ) {
             if (load(enStream, trStream, false)) {

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

@@ -1718 +1718 @@
         CheckParameterUtil.ensureParameterNotNull(input, "input");
 
-        InputStream istream = null;
-        try {
-            istream = input.openStream();
+        try (InputStream istream = Utils.openStream(input)) {
+            ImageInputStream stream = ImageIO.createImageInputStream(istream);
+            BufferedImage bi = read(stream, readMetadata, enforceTransparency);
+            if (bi == null) {
+                stream.close();
+            }
+            return bi;
         } catch (IOException e) {
             throw new IIOException("Can't get input stream from URL!", e);
         }
-        ImageInputStream stream = ImageIO.createImageInputStream(istream);
-        BufferedImage bi;
-        try {
-            bi = read(stream, readMetadata, enforceTransparency);
-            if (bi == null) {
-                stream.close();
-            }
-        } finally {
-            istream.close();
-        }
-        return bi;
     }
 

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

@@ -14 +14 @@
 import java.io.Closeable;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -26 +27 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
 import java.security.AccessController;
 import java.security.MessageDigest;
@@ -1736 +1740 @@
         }
     }
+
+    /**
+     * Convenient method to open an URL stream, using JOSM HTTP client if neeeded.
+     * @param url URL for reading from
+     * @return an input stream for reading from the URL
+     * @throws IOException if any I/O error occurs
+     * @since 13356
+     */
+    public static InputStream openStream(URL url) throws IOException {
+        switch (url.getProtocol()) {
+            case "http":
+            case "https":
+                return HttpClient.create(url).connect().getContent();
+            case "jar":
+                try {
+                    return url.openStream();
+                } catch (FileNotFoundException e) {
+                    // Workaround to https://bugs.openjdk.java.net/browse/JDK-4523159
+                    String urlPath = url.getPath();
+                    if (urlPath.startsWith("file:/") && urlPath.split("!").length > 2) {
+                        try {
+                            // Locate jar file
+                            int index = urlPath.lastIndexOf("!/");
+                            Path jarFile = Paths.get(urlPath.substring("file:/".length(), index));
+                            Path filename = jarFile.getFileName();
+                            FileTime jarTime = Files.readAttributes(jarFile, BasicFileAttributes.class).lastModifiedTime();
+                            // Copy it to temp directory (hopefully free of exclamation mark) if needed (missing or older jar)
+                            Path jarCopy = Paths.get(System.getProperty("java.io.tmpdir")).resolve(filename);
+                            if (!jarCopy.toFile().exists() ||
+                                    Files.readAttributes(jarCopy, BasicFileAttributes.class).lastModifiedTime().compareTo(jarTime) < 0) {
+                                Files.copy(jarFile, jarCopy, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
+                            }
+                            // Open the stream using the copy
+                            return new URL(url.getProtocol() + ':' + jarCopy.toUri().toURL().toExternalForm() + urlPath.substring(index))
+                                    .openStream();
+                        } catch (RuntimeException | IOException ex) {
+                            Logging.warn(ex);
+                        }
+                    }
+                    throw e;
+                }
+            case "file":
+            default:
+                return url.openStream();
+        }
+    }
 }