[java-identity-provider] 02/02: IDP-1499 - report correct version when building war at the end of a new install.

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5473672de419a6a1f43f8038c5bad2059746701c

commit 5473672de419a6a1f43f8038c5bad2059746701c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Dec 19 17:20:16 2019 +0000

    IDP-1499 - report correct version when building war at the end of a new install.
    
    https://issues.shibboleth.net/jira/projects/IDP/issues/IDP-1499
---
 .../src/main/java/net/shibboleth/idp/installer/BuildWar.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java
index 8e7f235..8c4d037 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java
@@ -25,6 +25,7 @@ import org.apache.tools.ant.taskdefs.Jar;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.shibboleth.idp.Version;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
@@ -68,7 +69,12 @@ public final class BuildWar extends AbstractInitializableComponent {
         final Path target = installerProps.getTargetDir();
         final Path warFile = target.resolve("war").resolve("idp.war");
 
-        log.info("Rebuilding {}, Version {}", warFile.toAbsolutePath(), currentState.getInstalledVersion());
+        String currentVersion = currentState.getInstalledVersion();
+        if (currentVersion == null) {
+            // indicates a clean install
+            currentVersion = Version.getVersion();
+        }
+        log.info("Rebuilding {}, Version {}", warFile.toAbsolutePath(), currentVersion);
         InstallerSupport.deleteTree(target.resolve("webpapp"));
         final Path webAppTmp =target.resolve("webpapp.tmp");
         InstallerSupport.deleteTree(webAppTmp);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.