Changeset 28438 in osm for applications/editors/josm/plugins/restart/src/josmrestartplugin/RestartJosmAction.java

Timestamp:

2012-06-16T23:05:53+02:00 (12 years ago)

Author:

upliner

Message:

'fix #j5635 -- pass java start options when restarting'

File:

• applications/editors/josm/plugins/restart/src/josmrestartplugin/RestartJosmAction.java (modified) (2 diffs)

applications/editors/josm/plugins/restart/src/josmrestartplugin/RestartJosmAction.java

@@ -6 +6 @@
 import java.awt.event.KeyEvent;
 import java.io.File;
+import java.lang.management.ManagementFactory;
+import java.util.LinkedList;
 
 import org.openstreetmap.josm.Main;
@@ -28 +30 @@
         try {
             File jarfile = new File(Main.class.getProtectionDomain().getCodeSource().getLocation().toURI());
-            long memmax = Runtime.getRuntime().maxMemory();
             String javacmd = "java";
             if (Main.platform instanceof PlatformHookWindows) javacmd = "javaw";
-            String[] cmds = new String[] {
-                    javacmd,
-                    "-Xmx" + memmax,
-                    "-jar",
-                    jarfile.getAbsolutePath()
-            };
+            LinkedList<String> cmds = new LinkedList<String>();
+            cmds.add(javacmd);
+            cmds.addAll(ManagementFactory.getRuntimeMXBean().getInputArguments());
+            cmds.add("-jar");
+            cmds.add(jarfile.getAbsolutePath());
             for (String s : cmds)
                 System.out.print(s + " ");
             System.out.println();
 
-            Runtime.getRuntime().exec(cmds);
+            Runtime.getRuntime().exec(cmds.toArray(new String[0]));
         } catch (Exception e) {
             e.printStackTrace();