Repository: qpid-broker-j Updated Branches: refs/heads/master 619d85b29 -> 93a288fdc
QPID-8208: [Broker-J] Strengthen handling of exception thrown on establishing of LDAP connections Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/93a288fd Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/93a288fd Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/93a288fd Branch: refs/heads/master Commit: 93a288fdc6d44c0a39ad217beb4b58e768753128 Parents: 619d85b Author: Alex Rudyy <[email protected]> Authored: Mon Jun 11 23:03:33 2018 +0100 Committer: Alex Rudyy <[email protected]> Committed: Mon Jun 11 23:10:58 2018 +0100 ---------------------------------------------------------------------- .../auth/manager/SimpleLDAPAuthenticationManagerImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/93a288fd/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java index 863f421..50abf4a 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java +++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java @@ -317,6 +317,11 @@ public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationM LOGGER.warn("Retrieving LDAP name for user '{}' resulted in error.", userId, e); return new AuthenticationResult(AuthenticationResult.AuthenticationStatus.ERROR, e); } + catch (Exception e) + { + LOGGER.warn("Unexpected exception on retrieving LDAP name for user '{}' ", userId, e); + return new AuthenticationResult(AuthenticationResult.AuthenticationStatus.ERROR, e); + } if(name == null) { @@ -361,6 +366,11 @@ public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationM LOGGER.warn("LDAP authentication attempt for username '{}' resulted in error.", name, e); return new AuthenticationResult(AuthenticationResult.AuthenticationStatus.ERROR, e); } + catch (Exception e) + { + LOGGER.warn("Unexpected exception on authentication attempt for username '{}' ", userId, e); + return new AuthenticationResult(AuthenticationResult.AuthenticationStatus.ERROR, e); + } finally { if(ctx != null) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
