From e3e566efb567c4a5d380ad1ad63ed447b105d4c7 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 26 Jul 2011 16:46:24 +0000 Subject: [PATCH] Change the variable names in the JVM version calculation code to reflect the nomenclature used by Java. Run the application with _appdir as the cwd like we claim to in the docs. --- .../java/com/threerings/getdown/data/Application.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/threerings/getdown/data/Application.java b/src/main/java/com/threerings/getdown/data/Application.java index 2b75d6f..0dbb56e 100644 --- a/src/main/java/com/threerings/getdown/data/Application.java +++ b/src/main/java/com/threerings/getdown/data/Application.java @@ -690,11 +690,11 @@ public class Application return true; } - int one = Integer.parseInt(m.group(1)); // will there ever be a two? - int major = Integer.parseInt(m.group(2)); - int minor = Integer.parseInt(m.group(3)); + int major = Integer.parseInt(m.group(1)); + int minor = Integer.parseInt(m.group(2)); + int revis = Integer.parseInt(m.group(3)); int patch = m.group(4) == null ? 0 : Integer.parseInt(m.group(4).substring(1)); - int version = patch + 100 * (minor + 100 * (major + 100 * one)); + int version = patch + 100 * (revis + 100 * (minor + 100 * major)); return version >= _javaVersion; } @@ -814,7 +814,7 @@ public class Application String[] sargs = args.toArray(new String[args.size()]); log.info("Running " + StringUtil.join(sargs, "\n ")); - return Runtime.getRuntime().exec(sargs, envp); + return Runtime.getRuntime().exec(sargs, envp, _appdir); } /**