From 73bd66758d3541e908398510721ffc845b51d966 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 12 Feb 2026 15:34:54 -0800 Subject: [PATCH] We need this special handling here. If we're running in the Digester, we need to and will see all of the java_location properties (one for each supported platform), but if we're running in a real installation, we'll only see the the one java_location that's appropriate for our platform. This initJava code gets called while we're in Digester mode, so it needs not to crash when it sees multiple java_location entries. --- .../main/java/com/threerings/getdown/data/Application.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/threerings/getdown/data/Application.java b/core/src/main/java/com/threerings/getdown/data/Application.java index 7c20476..a0860c1 100644 --- a/core/src/main/java/com/threerings/getdown/data/Application.java +++ b/core/src/main/java/com/threerings/getdown/data/Application.java @@ -686,7 +686,10 @@ public class Application // check to see if we require a particular JVM version and have a supplied JVM _javaExactVersionRequired = config.getBoolean("java_exact_version_required"); - _javaLocation = config.getString("java_location"); + Object javaloc = config.getRaw("java_location"); + if (javaloc instanceof String) { + _javaLocation = (String)javaloc; + } // used only in conjunction with java_location _javaLocalDir = getLocalPath(config.getString("java_local_dir", LaunchUtil.LOCAL_JAVA_DIR));