Changeset 12599 in josm

Timestamp:

2017-08-14T13:25:17+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15150 - catch NoClassDefFoundError in PluginProxy

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginHandler.java (modified) (1 diff)
• PluginProxy.java (modified) (4 diffs)

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

@@ -287 +287 @@
      * All exceptions that occured during plugin loading
      */
-    static final Map<String, Exception> pluginLoadingExceptions = new HashMap<>();
+    static final Map<String, Throwable> pluginLoadingExceptions = new HashMap<>();
 
     /**

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

@@ -56 +56 @@
     }
 
-    private void handlePluginException(Exception e) {
+    private void handlePluginException(Throwable e) {
         PluginHandler.pluginLoadingExceptions.put(getPluginInformation().name, e);
         BugReportExceptionHandler.handleException(new PluginException(this, getPluginInformation().name, e));
@@ -68 +68 @@
             Main.trace(e);
             Main.debug("Plugin "+plugin+" does not define mapFrameInitialized");
-        } catch (ReflectiveOperationException | IllegalArgumentException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException | NoClassDefFoundError e) {
             handlePluginException(e);
         }
@@ -81 +81 @@
             Main.debug("Plugin "+plugin+" does not define getPreferenceSetting");
             return null;
-        } catch (ReflectiveOperationException | IllegalArgumentException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException | NoClassDefFoundError e) {
             handlePluginException(e);
         }
@@ -94 +94 @@
             Main.trace(e);
             Main.debug("Plugin "+plugin+" does not define addDownloadSelection");
-        } catch (ReflectiveOperationException | IllegalArgumentException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException | NoClassDefFoundError e) {
             handlePluginException(e);
         }