Changeset 30755 in osm for applications/editors/josm/plugins/geotools/src/org

Timestamp:

2014-10-20T21:27:03+02:00 (10 years ago)

Author:

donvip

Message:

[josm_geotools] fix #josm10652 - robustness against JAI initialization

File:

• applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java

@@ -47 +47 @@
             // Update registry with com.sun.media.jai.imageioimpl.ImageReadWriteSpi (only class listed javax.media.jai.OperationRegistrySpi)
             // it would be safer to parse this file instead, but a JAI update is very unlikely as it has not been modified since 2005
-            new ImageReadWriteSpi().updateRegistry(registry);
+            try {
+                new ImageReadWriteSpi().updateRegistry(registry);
+            } catch (IllegalArgumentException e) {
+                // See #10652: IllegalArgumentException: A descriptor is already registered against the name "ImageRead" under registry mode "rendered"
+                Main.warn("geotools: error in JAI/ImageReadWriteSpi initialization: "+e.getMessage());
+            }
 
             // Update registry with GeoTools registry file
@@ -56 +61 @@
                     registry.updateFromStream(in);
                 }
-            } catch (IOException e) {
-                Main.error("geotools: error in JAI initialization: "+e.getMessage());
+            } catch (IOException | IllegalArgumentException e) {
+                Main.error("geotools: error in JAI/GeoTools initialization: "+e.getMessage());
             }
         }