Changeset 14978 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-04-09T19:37:28+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #17574 - fix IAE when plugins modify preferences (regression from r14977)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (3 diffs)
• tools/ReflectionUtils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -228 +228 @@
 
     protected void firePreferenceChanged(String key, Setting<?> oldValue, Setting<?> newValue) {
+        final Class<?> source = ReflectionUtils.findCallerClass(preferencesClasses);
         final PreferenceChangeEvent evt =
-                new DefaultPreferenceChangeEvent(ReflectionUtils.findCallerClass(preferencesClasses), key, oldValue, newValue);
+                new DefaultPreferenceChangeEvent(source != null ? source : getClass(), key, oldValue, newValue);
         listeners.fireEvent(listener -> listener.preferenceChanged(evt));
 

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

@@ -300 +300 @@
     }
 
+    /**
+     * Plugin class loaders.
+     */
+    private static final Map<PluginInformation, PluginClassLoader> classLoaders = new HashMap<>();
+
     private static PluginDownloadTask pluginDownloadTask;
 
@@ -317 +322 @@
     public static Collection<ClassLoader> getResourceClassLoaders() {
         return Collections.unmodifiableCollection(sources);
+    }
+
+    /**
+     * Returns all plugin classloaders.
+     * @return all plugin classloaders
+     * @since 14978
+     */
+    public static Collection<PluginClassLoader> getPluginClassLoaders() {
+        return Collections.unmodifiableCollection(classLoaders.values());
     }
 
@@ -837 +851 @@
                 return;
 
-            Map<PluginInformation, PluginClassLoader> classLoaders = new HashMap<>();
+            classLoaders.clear();
             for (PluginInformation info : toLoad) {
                 PluginClassLoader cl = AccessController.doPrivileged((PrivilegedAction<PluginClassLoader>)

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

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.function.Function;
+
+import org.openstreetmap.josm.plugins.PluginHandler;
 
 /**
@@ -46 +48 @@
                 return Class.forName(x.getClassName());
             } catch (ClassNotFoundException e) {
+                for (ClassLoader cl : PluginHandler.getPluginClassLoaders()) {
+                    try {
+                        return Class.forName(x.getClassName(), true, cl);
+                    } catch (ClassNotFoundException ex) {
+                        Logging.trace(ex);
+                    }
+                }
                 Logging.error(e);
                 return null;