From b18f96c1d69599132c94fa352308223a715559b3 Mon Sep 17 00:00:00 2001 From: e507802 Date: Wed, 29 May 2019 15:31:45 +0200 Subject: [PATCH] fix regression from PR #221 when bootstrapping into empty directory with -Dappbase=... the version from the fetched getdown.txt must be extracted before calling processArg(SysProps.overrideAppbase(_appbase)) - otherwise _version is -1 instead of the version provided in the just downloaded getdown.txt. --- .../main/java/com/threerings/getdown/data/Application.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 fa132f9..06eab4d 100644 --- a/core/src/main/java/com/threerings/getdown/data/Application.java +++ b/core/src/main/java/com/threerings/getdown/data/Application.java @@ -579,6 +579,9 @@ public class Application config = new Config(cdata); } + // extract our version information + _version = config.getLong("version", -1L); + // first determine our application base, this way if anything goes wrong later in the // process, our caller can use the appbase to download a new configuration file _appbase = config.getString("appbase"); @@ -594,9 +597,6 @@ public class Application _appbase = _appbase + "/"; } - // extract our version information - _version = config.getLong("version", -1L); - // if we are a versioned deployment, create a versioned appbase try { _vappbase = createVAppBase(_version);