Changeset 17395 in josm for trunk

Timestamp:

2020-12-07T12:40:06+01:00 (3 years ago)

Author:

GerdP

Message:

see #19098: Unable to update plugin after crash of plugin

• restore and document old behaviour to return null in case of errors in public method loadLocallyAvailablePluginInformation()

File:

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

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

@@ -947 +947 @@
      *
      * @param monitor the progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null.
-     * @return the list of locally available plugin information
+     * @return the list of locally available plugin information, null in case of errors
      *
      */
@@ -955 +955 @@
         }
         try {
-            Map<String, PluginInformation> ret = new HashMap<>();
             ReadLocalPluginInformationTask task = new ReadLocalPluginInformationTask(monitor);
             Future<?> future = MainApplication.worker.submit(task);
@@ -962 +961 @@
             } catch (ExecutionException e) {
                 Logging.error(e);
-                return ret;
+                return null;
             } catch (InterruptedException e) {
                 Logging.warn("InterruptedException in " + PluginHandler.class.getSimpleName()
                         + " while loading locally available plugin information");
-                return ret;
-            }
+                return null;
+            }
+            Map<String, PluginInformation> ret = new HashMap<>();
             for (PluginInformation pi: task.getAvailablePlugins()) {
                 ret.put(pi.name, pi);