[java-identity-provider] branch master updated: IDP-1499 IDP-1523 Misc fixes flushed by Windows testing

[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=40c661ed9bc87823c1fb8f1f944a4d7f7d94dc83

The following commit(s) were added to refs/heads/master by this push:
       new  40c661e   IDP-1499 IDP-1523 Misc fixes flushed by Windows testing
40c661e is described below

commit 40c661ed9bc87823c1fb8f1f944a4d7f7d94dc83
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jan 3 15:02:43 2020 +0000

    IDP-1499 IDP-1523 Misc fixes flushed by Windows testing
    
    https://issues.shibboleth.net/jira/browse/IDP-1499
    https://issues.shibboleth.net/jira/browse/IDP-1523
---
 .../java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java
index 87caf62..02a763c 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java
@@ -63,7 +63,7 @@ public class InstallerPropertiesImpl extends AbstractInitializableComponent impl
     public static final String LDAP_PROPERTIES_MERGE = "ldap.merge.properties";
 
     /** The LDAP Password (usually associated with a username in ldap.properties). */
-    public static final String LDAP_PASSWORD = "idp.LDAP.Credentials";
+    public static final String LDAP_PASSWORD = "idp.LDAP.credential";
 
     /** The name of a directory to overlay "under" the distribution conf. */
     public static final String CONF_PRE_OVERLAY = "idp.conf.preoverlay";
@@ -493,7 +493,7 @@ public class InstallerPropertiesImpl extends AbstractInitializableComponent impl
 
     /** {@inheritDoc}. */
     @Override @Nullable public String getLDAPPassword() throws BuildException {
-        return  installerProperties.getProperty(LDAP_PASSWORD);
+        return installerProperties.getProperty(LDAP_PASSWORD);
     }
 
     /** {@inheritDoc}. */
@@ -576,7 +576,7 @@ public class InstallerPropertiesImpl extends AbstractInitializableComponent impl
                     throw new BuildException("No a directory");
                 }
             } else {
-                if (!Files.isDirectory(result)) {
+                if (Files.isDirectory(result)) {
                     log.error("Path '{}' supplied by property '{}' was not a file", result, propName);
                     throw new BuildException("No a file");
                 }                

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