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

Timestamp:

2013-09-18T23:02:11+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9077 - Restart doesn't work if jar path contains spaces

File:

• trunk/src/org/openstreetmap/josm/actions/RestartAction.java (modified) (1 diff)

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

@@ -91 +91 @@
             // program main and program arguments (be careful a sun property. might not be supported by all JVM)
             String[] mainCommand = System.getProperty("sun.java.command").split(" ");
+            // look for a .jar in all chunks to support paths with spaces (fix #9077)
+            String jarPath = mainCommand[0];
+            for (int i = 1; i < mainCommand.length && !jarPath.endsWith(".jar"); i++) {
+                jarPath += " " + mainCommand[i];
+            }
             // program main is a jar
-            if (mainCommand[0].endsWith(".jar")) {
+            if (jarPath.endsWith(".jar")) {
                 // if it's a jar, add -jar mainJar
                 cmd.add("-jar");
-                cmd.add(new File(mainCommand[0]).getPath());
+                cmd.add(new File(jarPath).getPath());
             } else {
                 // else it's a .class, add the classpath and mainClass