[java-identity-provider] branch master updated: Merge from maint-3.3

[Daniel Fisher]

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

dfisher 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=0a53fc512b586b38247f4c1a05fd865a6ec27800

The following commit(s) were added to refs/heads/master by this push:
       new  0a53fc5   Merge from maint-3.3
0a53fc5 is described below

commit 0a53fc512b586b38247f4c1a05fd865a6ec27800
Author: Daniel Fisher <dfisher at gmail.com>
AuthorDate: Sun Oct 1 11:08:44 2017 -0400

    Merge from maint-3.3
    
    See c9d760ccf7fafd727e289e0db8d848eee627091e
---
 .../idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 a19413b..208ae7d 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
@@ -174,10 +174,14 @@ public class LDAPDataConnector extends AbstractSearchDataConnector<ExecutableSea
                 }
             }
         } catch (final Exception e) {
-            log.warn("{} Error inspecting SSL configuration", getLogPrefix(), e);
+            log.debug("{} Error inspecting SSL configuration", getLogPrefix(), e);
         } finally {
             if (conn != null) {
-                conn.close();
+                try {
+                    conn.close();
+                } catch (final Exception e) {
+                    log.debug("{} Error closing LDAP connection", getLogPrefix(), e);
+                }
             }
         }
     }

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