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

Timestamp:

2018-01-08T02:45:59+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15742 - check downloaded plugin is valid *before* we delete any existing one (patch by ris)

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (2 diffs)

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

@@ -1258 +1258 @@
             File plugin = new File(filePath.substring(0, filePath.length() - 4));
             String pluginName = updatedPlugin.getName().substring(0, updatedPlugin.getName().length() - 8);
-            if (plugin.exists() && !plugin.delete() && dowarn) {
-                Logging.warn(tr("Failed to delete outdated plugin ''{0}''.", plugin.toString()));
-                Logging.warn(tr("Failed to install already downloaded plugin ''{0}''. " +
-                        "Skipping installation. JOSM is still going to load the old plugin version.",
-                        pluginName));
-                continue;
-            }
             try {
                 // Check the plugin is a valid and accessible JAR file before installing it (fix #7754)
@@ -1273 +1266 @@
                             plugin.toString(), updatedPlugin.toString(), e.getLocalizedMessage()), e);
                 }
+                continue;
+            }
+            if (plugin.exists() && !plugin.delete() && dowarn) {
+                Logging.warn(tr("Failed to delete outdated plugin ''{0}''.", plugin.toString()));
+                Logging.warn(tr("Failed to install already downloaded plugin ''{0}''. " +
+                        "Skipping installation. JOSM is still going to load the old plugin version.",
+                        pluginName));
                 continue;
             }