AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dropped obsolete comment

Browse Source
This commit is contained in:
sergiorussia
2019-05-27 23:11:28 +03:00
parent 01825b6f88
commit 0d384966a6
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/threerings/getdown/data/Application.java
+6 -7
View File
@@ -621,7 +621,7 @@ public class Application
// make sure there's a trailing slash // make sure there's a trailing slash
if (!_appbase.endsWith("/")) { if (!_appbase.endsWith("/")) {
_appbase += "/"; _appbase = _appbase + "/";
} }
// extract our version information // extract our version information
@@ -638,9 +638,11 @@ public class Application
// check for a latest config URL // check for a latest config URL
String latest = config.getString("latest"); String latest = config.getString("latest");
if (latest != null) { if (latest != null) {
latest = latest.startsWith(_appbase) if (latest.startsWith(_appbase)) {
? _appbase + latest.substring(_appbase.length()) latest = _appbase + latest.substring(_appbase.length());
: SysProps.replaceDomain(latest); } else {
latest = SysProps.replaceDomain(latest);
}
try { try {
_latest = HostWhitelist.verify(new URL(latest)); _latest = HostWhitelist.verify(new URL(latest));
} catch (MalformedURLException mue) { } catch (MalformedURLException mue) {
@@ -668,9 +670,6 @@ public class Application
// check to see if we require a particular JVM version and have a supplied JVM // check to see if we require a particular JVM version and have a supplied JVM
_javaExactVersionRequired = config.getBoolean("java_exact_version_required"); _javaExactVersionRequired = config.getBoolean("java_exact_version_required");
// this is a little weird, but when we're run from the digester, we see a String[] which
// contains java locations for all platforms which we can't grok, but the digester doesn't
// need to know about that; when we're run in a real application there will be only one!
_javaLocation = config.getString("java_location"); _javaLocation = config.getString("java_location");
// used only in conjunction with java_location // used only in conjunction with java_location