Changeset 13356 in josm for trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

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)

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (1 diff)

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;
     }