Changeset 12323 in josm

Timestamp:

2017-06-06T19:43:38+02:00 (6 years ago)

Author:

bastiK

Message:

see #14901 - some cleanup

Location:

trunk

Files:

• src/org/openstreetmap/josm/plugins/PluginClassLoader.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java (modified) (1 diff)

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

@@ -50 +50 @@
                     return result;
                 }
-            } catch (ClassNotFoundException e) {}
+            } catch (ClassNotFoundException e) {
+                // do nothing
+            }
         }
         Class<?> result = super.loadClass(name, resolve);

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

@@ -827 +827 @@
             Map<PluginInformation, PluginClassLoader> classLoaders = new HashMap<>();
             for (PluginInformation info : toLoad) {
-                classLoaders.put(info, new PluginClassLoader(
+                PluginClassLoader cl = AccessController.doPrivileged((PrivilegedAction<PluginClassLoader>)
+                    () -> new PluginClassLoader(
                         info.libraries.toArray(new URL[0]),
                         Main.class.getClassLoader(),
                         null));
+                classLoaders.put(info, cl);
             }
 
@@ -1213 +1215 @@
     }
 
+    /**
+     * Returns the plugin class loader for the plugin of the specified name.
+     * @param name The plugin name
+     * @return The plugin class loader for the plugin of the specified name, if
+     * installed and loaded, or {@code null} otherwise.
+     * @since 12323
+     */
+    public static PluginClassLoader getPluginClassLoader(String name) {
+        for (PluginProxy plugin : pluginList) {
+            if (plugin.getPluginInformation().name.equals(name))
+                return plugin.getClassLoader();
+        }
+        return null;
+    }
+
     public static void addDownloadSelection(List<DownloadSelection> downloadSelections) {
         for (PluginProxy p : pluginList) {

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java

@@ -127 +127 @@
 
     private static String findFaultyPlugin(Collection<PluginInformation> plugins, Throwable root) {
-        DynamicURLClassLoader cl = PluginHandler.getPluginClassLoader();
         for (PluginInformation p : plugins) {
             try {
+                ClassLoader cl = PluginHandler.getPluginClassLoader(p.getName());
                 String pluginPackage = cl.loadClass(p.className).getPackage().getName();
                 for (StackTraceElement e : root.getStackTrace()) {