[java-identity-provider] branch main updated: IDP-2341 Installer regression

[Rod Widdowson]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
     new aad22dd0e IDP-2341 Installer regression
aad22dd0e is described below

commit aad22dd0e843f181ee6d9434f43bdd72c1353c40
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Oct 25 10:33:47 2024 +0100

    IDP-2341 Installer regression
    
    https://shibboleth.atlassian.net/browse/IDP-2341
---
 .../net/shibboleth/idp/installer/impl/InstallerPropertiesImpl.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/InstallerPropertiesImpl.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/InstallerPropertiesImpl.java
index 02ea43ff1..ae1485d43 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/InstallerPropertiesImpl.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/InstallerPropertiesImpl.java
@@ -155,7 +155,7 @@ public class InstallerPropertiesImpl  {
         }
         log.debug("Source dir {}", srcDir);
 
-        final Path propertyFile = getMergeFile(InstallerProperties.ENTITY_ID);
+        final Path propertyFile = getMergeFile(InstallerProperties.PROPERTY_SOURCE_FILE);
         if (propertyFile != null) {
             /* The file specified in the system file idp.property.file (if present). */
             final File idpPropertyFile = propertyFile.toFile();
@@ -564,5 +564,4 @@ public class InstallerPropertiesImpl  {
     @Nullable public Path getLDAPMergeProperties() throws BuildException {
         return getMergeFile(InstallerProperties.LDAP_PROPERTIES_MERGE);
     }
-
-}
\ No newline at end of file
+}

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