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

Timestamp:

2018-09-09T00:50:46+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16047 - make JOSM able to load JAXB as a plugin:

• JAXB initialize itself through ServiceLoader and context class loader so it must be set correctly when initializing a plugin
• plugin class loaders were not loading resources correctly

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginClassLoader.java (modified) (1 diff)
• PluginInformation.java (modified) (1 diff)

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

@@ -81 +81 @@
 
     @Override
+    public URL findResource(String name) {
+        URL resource = super.findResource(name);
+        if (resource == null) {
+            for (PluginClassLoader dep : dependencies) {
+                resource = dep.findResource(name);
+                if (resource != null) {
+                    break;
+                }
+            }
+        }
+        return resource;
+    }
+
+    @Override
     public String toString() {
         return "PluginClassLoader [urls=" + Arrays.toString(getURLs()) +

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

@@ -345 +345 @@
         try {
             Constructor<?> c = klass.getConstructor(PluginInformation.class);
-            Object plugin = c.newInstance(this);
-            return new PluginProxy(plugin, this, classLoader);
+            ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+            Thread.currentThread().setContextClassLoader(classLoader);
+            try {
+                return new PluginProxy(c.newInstance(this), this, classLoader);
+            } finally {
+                Thread.currentThread().setContextClassLoader(contextClassLoader);
+            }
         } catch (ReflectiveOperationException e) {
             throw new PluginException(name, e);