Changeset 17664 in josm

Timestamp:

2021-03-25T14:28:33+01:00 (4 years ago)

Author:

Don-vip

Message:

see #18737 - Call parent.loadClass(String) - IcedTea-Web JNLPClassLoader overrides loadClass(String) but not loadClass(String, boolean)

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginClassLoader.java (modified) (1 diff)

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

@@ -66 +66 @@
                     }
                 } catch (ClassNotFoundException e) {
-                    // do nothing
-                    Logging.trace("Plugin class not found in {0}: {1}", dep, e.getMessage());
+                    Logging.trace("Plugin class not found in dep {0}: {1}", dep, e.getMessage());
                     Logging.trace(e);
                 }
             }
-            result = super.loadClass(name, resolve);
+            try {
+                // Will delegate to parent.loadClass(name, resolve) if needed
+                result = super.loadClass(name, resolve);
+            } catch (ClassNotFoundException e) {
+                Logging.trace("Plugin class not found in super {0}: {1}", this, e.getMessage());
+                Logging.trace(e);
+            }
+        }
+        // IcedTea-Web JNLPClassLoader overrides loadClass(String) but not loadClass(String, boolean)
+        if (result == null && getParent() != null) {
+            try {
+                result = getParent().loadClass(name);
+            } catch (ClassNotFoundException e) {
+                Logging.trace("Plugin class not found in parent {0}: {1}", getParent(), e.getMessage());
+                Logging.trace(e);
+            }
         }
         if (result != null) {