Changeset 6282 in josm for trunk

Timestamp:

2013-10-02T00:38:02+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - Bad practice - Classloaders should only be created inside doPrivileged block

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• Plugin.java (modified) (2 diffs)
• PluginHandler.java (modified) (2 diffs)

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

@@ -9 +9 @@
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.List;
 
@@ -142 +144 @@
         File pluginDir = Main.pref.getPluginsDirectory();
         File pluginJar = new File(pluginDir, info.name + ".jar");
-        URL pluginJarUrl = PluginInformation.fileToURL(pluginJar);
-        URLClassLoader pluginClassLoader = new URLClassLoader(new URL[] { pluginJarUrl } , Main.class.getClassLoader());
-        return pluginClassLoader;
+        final URL pluginJarUrl = PluginInformation.fileToURL(pluginJar);
+        return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+              public ClassLoader run() {
+                  return new URLClassLoader(new URL[] {pluginJarUrl}, Main.class.getClassLoader());
+              }
+        });
     }
 }

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

@@ -16 +16 @@
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -527 +529 @@
 
         // create a classloader for all plugins:
-        URL[] jarUrls = new URL[allPluginLibraries.size()];
-        jarUrls = allPluginLibraries.toArray(jarUrls);
-        URLClassLoader pluginClassLoader = new URLClassLoader(jarUrls, Main.class.getClassLoader());
-        return pluginClassLoader;
+        final URL[] jarUrls = allPluginLibraries.toArray(new URL[allPluginLibraries.size()]);
+        return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+            public ClassLoader run() {
+                return new URLClassLoader(jarUrls, Main.class.getClassLoader());
+            }
+      });
     }