[java-identity-provider] branch master updated: IDP-1499 Do not even *think about key creation if this is an upgrade

[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=056ffd7061aa21e57d0db86b8cfd25b3d8d37e26

The following commit(s) were added to refs/heads/master by this push:
       new  056ffd7   IDP-1499 Do not even *think about key creation if this is an upgrade
056ffd7 is described below

commit 056ffd7061aa21e57d0db86b8cfd25b3d8d37e26
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jan 28 15:11:59 2020 +0000

    IDP-1499 Do not even *think about key creation if this is an upgrade
    
    https://issues.shibboleth.net/jira/browse/IDP-1499
---
 .../src/main/java/net/shibboleth/idp/installer/V4Install.java         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
index 9bc3808..ba2a6c7 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
@@ -481,6 +481,10 @@ public class V4Install extends AbstractInitializableComponent {
          * @throws BuildException if badness occurs
          */
         protected void execute() throws BuildException {
+            if (currentState.getInstalledVersion() != null) {
+                log.debug("Skipping key generation");
+                return;
+            }
             ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
             createdSigning = generateKey("idp-signing");
             createdEncryption = generateKey("idp-encryption");

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