Changeset 12524 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2017-07-27T18:36:09+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15079, see #13973 - catch unexplainable "NoClassDefFoundError: Could not initialize class sun.awt.image.ShortInterleavedRaster"

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (3 diffs)

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

@@ -1714 +1714 @@
         ImageReadParam param = reader.getDefaultReadParam();
         reader.setInput(stream, true, !readMetadata && !enforceTransparency);
-        BufferedImage bi;
+        BufferedImage bi = null;
         try {
             bi = reader.read(0, param);
@@ -1731 +1731 @@
                 }
             }
+        } catch (LinkageError e) {
+            // On Windows, ComponentColorModel.getRGBComponent can fail with "UnsatisfiedLinkError: no awt in java.library.path", see #13973
+            // Then it can leads to "NoClassDefFoundError: Could not initialize class sun.awt.image.ShortInterleavedRaster", see #15079
+            Main.error(e);
         } finally {
             reader.dispose();
@@ -1791 +1795 @@
             // JAI doesn't like some JPEG files with error "Inconsistent metadata read from stream" (see #10267)
             Main.warn(e);
-        } catch (UnsatisfiedLinkError e) {
-            // On Windows, ComponentColorModel.getRGBComponent can fail with "UnsatisfiedLinkError: no awt in java.library.path", see #13973
-            Main.error(e);
         }
         return null;