Changeset 7294 in josm

Timestamp:

2014-07-07T22:44:23+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10242 - catch NoClassDefFoundError when ClassNotFoundException is catched

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• data/osm/visitor/paint/MapRendererFactory.java (modified) (1 diff)
• data/projection/datum/NTV2Util.java (modified) (1 diff)
• plugins/PluginInformation.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -790 +790 @@
                 UIManager.setLookAndFeel(laf);
             }
-            catch (final ClassNotFoundException e) {
+            catch (final NoClassDefFoundError | ClassNotFoundException e) {
                 info("Look and Feel not found: " + laf);
                 Main.pref.put("laf", defaultlaf);

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java

@@ -102 +102 @@
             try {
                 return Class.forName(className, true, cl);
-            } catch (final ClassNotFoundException e) {
-                // ignore
+            } catch (final NoClassDefFoundError | ClassNotFoundException e) {
+                Main.trace(e.getMessage());
             }
         }

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java

@@ -114 +114 @@
             Class.forName("java.nio.channels.FileChannel");
             nioAvailable = true;
-        } catch (ClassNotFoundException cnfe) {
+        } catch (NoClassDefFoundError | ClassNotFoundException cnfe) {
             Main.info(cnfe.getMessage());
         }

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -333 +333 @@
         try {
             return Class.forName(className, true, classLoader);
-        } catch (ClassNotFoundException | ClassCastException e) {
+        } catch (NoClassDefFoundError | ClassNotFoundException | ClassCastException e) {
             throw new PluginException(name, e);
         }