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

Timestamp:

2017-05-29T15:43:26+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #14850 - NPE on launch: make sure RestartAction (and all the GUI stuff behind) is not constructed before GUI is fully initialized

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/RestartAction.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/RestartAction.java

@@ -56 +56 @@
     @Override
     public void actionPerformed(ActionEvent e) {
+        try {
+            restartJOSM();
+        } catch (IOException ex) {
+            Main.error(ex);
+        }
+    }
+
+    /**
+     * Determines if restarting the application should be possible on this platform.
+     * @return {@code true} if the mandatory system property {@code sun.java.command} is defined, {@code false} otherwise.
+     * @since 5951
+     */
+    public static boolean isRestartSupported() {
+        return System.getProperty("sun.java.command") != null;
+    }
+
+    /**
+     * Restarts the current Java application.
+     * @throws IOException in case of any I/O error
+     */
+    public static void restartJOSM() throws IOException {
         // If JOSM has been started with property 'josm.restart=true' this means
         // it is executed by a start script that can handle restart.
@@ -64 +85 @@
         }
 
-        try {
-            restartJOSM();
-        } catch (IOException ex) {
-            Main.error(ex);
-        }
-    }
-
-    /**
-     * Determines if restarting the application should be possible on this platform.
-     * @return {@code true} if the mandatory system property {@code sun.java.command} is defined, {@code false} otherwise.
-     * @since 5951
-     */
-    public static boolean isRestartSupported() {
-        return System.getProperty("sun.java.command") != null;
-    }
-
-    /**
-     * Restarts the current Java application.
-     * @throws IOException in case of any I/O error
-     */
-    public static void restartJOSM() throws IOException {
         if (isRestartSupported() && !Main.exitJosm(false, 0, SaveLayersDialog.Reason.RESTART)) return;
         final List<String> cmd;

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

@@ -498 +498 @@
                     Main.info(tr("Detected no useable IPv6 network, prefering IPv4 over IPv6 after next restart."));
                     Main.pref.put("validated.ipv6", hasv6); // be sure it is stored before the restart!
-                    new RestartAction().actionPerformed(null);
+                    try {
+                        RestartAction.restartJOSM();
+                    } catch (IOException e) {
+                        Main.error(e);
+                    }
                 }
                 Main.pref.put("validated.ipv6", hasv6);

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

@@ -610 +610 @@
                         Main.pref.putCollection("plugins", plugins);
                         // restart
-                        new RestartAction().actionPerformed(null);
+                        try {
+                            RestartAction.restartJOSM();
+                        } catch (IOException e) {
+                            Main.error(e);
+                        }
                     } else {
                         Main.warn("No plugin downloaded, restart canceled");