Changeset 13294 in josm

Timestamp:

2018-01-07T22:54:01+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15554 - fix plugin classloader after plugin update

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MainApplication.java (modified) (1 diff)
• plugins/PluginDownloadTask.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -1226 +1226 @@
 
         monitor.indeterminateSubTask(tr("Installing updated plugins"));
-        PluginHandler.installDownloadedPlugins(true);
+        PluginHandler.installDownloadedPlugins(pluginsToLoad, true);
 
         monitor.indeterminateSubTask(tr("Loading early plugins"));

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

@@ -182 +182 @@
             downloaded.add(d);
         }
-        PluginHandler.installDownloadedPlugins(false);
+        PluginHandler.installDownloadedPlugins(toUpdate, false);
     }
 

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

@@ -16 +16 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -1234 +1235 @@
 
     /**
-     * Installs downloaded plugins. Moves files with the suffix ".jar.new" to the corresponding
-     * ".jar" files.
+     * Installs downloaded plugins. Moves files with the suffix ".jar.new" to the corresponding ".jar" files.
      *
      * If {@code dowarn} is true, this methods emits warning messages on the console if a downloaded
@@ -1241 +1241 @@
      * installation of the respective plugin is silently skipped.
      *
+     * @param pluginsToLoad list of plugin informations to update
      * @param dowarn if true, warning messages are displayed; false otherwise
-     */
-    public static void installDownloadedPlugins(boolean dowarn) {
+     * @since 13294
+     */
+    public static void installDownloadedPlugins(Collection<PluginInformation> pluginsToLoad, boolean dowarn) {
         File pluginDir = Main.pref.getPluginsDirectory();
         if (!pluginDir.exists() || !pluginDir.isDirectory() || !pluginDir.canWrite())
@@ -1274 +1276 @@
             }
             // Install plugin
-            if (!updatedPlugin.renameTo(plugin) && dowarn) {
+            if (updatedPlugin.renameTo(plugin)) {
+                try {
+                    // Update plugin URL
+                    URL newPluginURL = plugin.toURI().toURL();
+                    URL oldPluginURL = updatedPlugin.toURI().toURL();
+                    pluginsToLoad.stream().filter(x -> x.libraries.contains(oldPluginURL)).forEach(
+                            x -> Collections.replaceAll(x.libraries, oldPluginURL, newPluginURL));
+                } catch (MalformedURLException e) {
+                    Logging.warn(e);
+                }
+            } else if (dowarn) {
                 Logging.warn(tr("Failed to install plugin ''{0}'' from temporary download file ''{1}''. Renaming failed.",
                         plugin.toString(), updatedPlugin.toString()));