Changeset 5967 in josm

Timestamp:

2013-05-23T00:38:59+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8720, see #8733 - More checks and some debug info in RestartAction

File:

• trunk/src/org/openstreetmap/josm/actions/RestartAction.java (modified) (4 diffs)

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

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.PlatformHookWindows;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -49 +50 @@
     
     /**
-     * Determines if restartting the application should be possible on this platform.
+     * 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
@@ -65 +66 @@
         try {
             // java binary
-            final List<String> cmd = new ArrayList<String>(Collections.singleton(System.getProperty("java.home") + "/bin/java"));
+            final String java = System.getProperty("java.home") + File.separator + "bin" + File.separator + 
+                    (Main.platform instanceof PlatformHookWindows ? "java.exe" : "java");
+            if (!new File(java).isFile()) {
+                throw new IOException("Unable to find suitable java runtime at "+java);
+            }
+            final List<String> cmd = new ArrayList<String>(Collections.singleton(java));
             // vm arguments
             for (String arg : ManagementFactory.getRuntimeMXBean().getInputArguments()) {
@@ -89 +95 @@
             // finally add program arguments
             cmd.addAll(Arrays.asList(Main.commandLineArgs));
+            Main.info("Restart "+cmd);
             // execute the command in a shutdown hook, to be sure that all the
             // resources have been disposed before restarting the application