[java-identity-provider] 05/05: Tidy up probing of LDAPS configuration

[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=66f048ec4ace3afdb42bf6465667a1bfc70c04cb

commit 66f048ec4ace3afdb42bf6465667a1bfc70c04cb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Sep 26 15:29:28 2019 +0100

    Tidy up probing of LDAPS configuration
    
    - Failure of the probe is not fatal
    - A non-existent connection  is not fatal
---
 .../idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
index c48914b..ff9fead 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
@@ -165,6 +165,10 @@ public class LDAPDataConnector extends AbstractSearchDataConnector<ExecutableSea
         Connection conn = null;
         try {
             conn = connectionFactory.getConnection();
+            if (conn == null) {
+                log.debug("{} No connection to probe", getLogPrefix());
+                return;
+            }
             final ConnectionConfig connConfig = conn.getConnectionConfig();
             if (connConfig.getUseStartTLS() ||
                     connConfig.getUseSSL() ||
@@ -182,7 +186,7 @@ public class LDAPDataConnector extends AbstractSearchDataConnector<ExecutableSea
                 }
             }
         } catch (final GeneralSecurityException | LdapException e) {
-            throw new ComponentInitializationException(getLogPrefix() + " Failed to inspect SLL implementation", e);
+            log.debug("{} Failed to inspect SLL implementation", getLogPrefix(), e);
         } finally {
             if (conn != null) {
                 try {

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