Changeset 1818 in josm for trunk

Timestamp:

2009-07-20T21:43:37+02:00 (15 years ago)

Author:

jttt

Message:

Fix #3010 - NPE at PluginSelection

Location:

trunk

Files:

• src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) (1 diff)
• test (modified) (1 prop)

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

@@ -67 +67 @@
         for (String pluginName : Main.pref.getCollection("plugins", Collections.<String>emptySet())) {
             PluginInformation local = localPlugins.get(pluginName);
-            PluginInformation description = availablePlugins.get(local.name);
-
-            if (description.version != null && !description.version.equals(local.version)) {
+            PluginInformation description = availablePlugins.get(pluginName);
+
+            if (description == null) {
+                System.out.println(tr("Plug-in named {0} is not available. Update skipped.", pluginName));
+                continue;
+            }
+
+            if (local == null || (description.version != null && !description.version.equals(local.version))) {
                 toUpdate.add(description);
-                toUpdateStr.append(description.name+"\n");
+                toUpdateStr.append(pluginName+"\n");
             }
         }