From 382bb2cd5b1218afe3cabb6d2aca2d443e00d0e4 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Mon, 16 Feb 2015 08:34:54 -0800 Subject: [PATCH] Parse java_max_version down by java_min_version. --- .../java/com/threerings/getdown/data/Application.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/threerings/getdown/data/Application.java b/src/main/java/com/threerings/getdown/data/Application.java index d0804b0..63f8d87 100644 --- a/src/main/java/com/threerings/getdown/data/Application.java +++ b/src/main/java/com/threerings/getdown/data/Application.java @@ -533,10 +533,6 @@ public class Application String vstr = (String)cdata.get("version"); if (vstr != null) _version = parseLong(vstr, "m.invalid_version"); - // check to see if we require a particular max JVM version and have a supplied JVM - vstr = (String)cdata.get("java_max_version"); - if (vstr != null) _javaMaxVersion = (int)parseLong(vstr, "m.invalid_java_version"); - // if we are a versioned deployment, create a versioned appbase try { _vappbase = (_version < 0) ? new URL(_appbase) : createVAppBase(_version); @@ -572,6 +568,10 @@ public class Application vstr = (String)cdata.get("java_min_version"); if (vstr != null) _javaMinVersion = (int)parseLong(vstr, "m.invalid_java_version"); + // check to see if we require a particular max JVM version and have a supplied JVM + vstr = (String)cdata.get("java_max_version"); + if (vstr != null) _javaMaxVersion = (int)parseLong(vstr, "m.invalid_java_version"); + // check to see if we require a particular JVM version and have a supplied JVM vstr = (String)cdata.get("java_exact_version_required"); _javaExactVersionRequired = Boolean.parseBoolean(vstr);