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

Timestamp:

2018-08-07T20:26:10+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16576 - catch UnsatisfiedLinkError

File:

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

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

@@ -978 +978 @@
                 try {
                     img = read(Utils.fileToURL(cf.getFile()), false, false);
-                } catch (IOException e) {
-                    Logging.log(Logging.LEVEL_WARN, "IOException while reading HTTP image:", e);
+                } catch (IOException | UnsatisfiedLinkError e) {
+                    Logging.log(Logging.LEVEL_WARN, "Exception while reading HTTP image:", e);
                 }
                 return img == null ? null : new ImageResource(img);
@@ -1035 +1035 @@
                     Image img = read(new ByteArrayInputStream(bytes), false, true);
                     return img == null ? null : new ImageResource(img);
-                } catch (IOException e) {
-                    Logging.log(Logging.LEVEL_WARN, "IOException while reading image:", e);
+                } catch (IOException | UnsatisfiedLinkError e) {
+                    Logging.log(Logging.LEVEL_WARN, "Exception while reading image:", e);
                 }
             }
@@ -1120 +1120 @@
                         try {
                             img = read(new ByteArrayInputStream(buf), false, false);
-                        } catch (IOException e) {
+                        } catch (IOException | UnsatisfiedLinkError e) {
                             Logging.warn(e);
                         }
@@ -1129 +1129 @@
                 }
             }
-        } catch (IOException e) {
+        } catch (IOException | UnsatisfiedLinkError e) {
             Logging.log(Logging.LEVEL_WARN, tr("Failed to handle zip file ''{0}''. Exception was: {1}", archive.getName(), e.toString()), e);
         }
@@ -1165 +1165 @@
                     Logging.debug("Transparency has been forced for image {0}", path);
                 }
-            } catch (IOException e) {
+            } catch (IOException | UnsatisfiedLinkError e) {
                 Logging.log(Logging.LEVEL_WARN, "Unable to read image", e);
                 Logging.debug(e);