Repository: qpid-broker-j Updated Branches: refs/heads/master 93a288fdc -> ad99c10ef
Revert "QPID-8208: [Broker-J] Strengthen handling of exception thrown on establishing of LDAP connections" This reverts commit 93a288fdc6d44c0a39ad217beb4b58e768753128. 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/ad99c10e Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/ad99c10e Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/ad99c10e Branch: refs/heads/master Commit: ad99c10efdec912845107af228610c3e323ef68e Parents: 93a288f Author: Alex Rudyy <[email protected]> Authored: Tue Jun 12 09:53:15 2018 +0100 Committer: Alex Rudyy <[email protected]> Committed: Tue Jun 12 09:53:15 2018 +0100 ---------------------------------------------------------------------- .../auth/manager/SimpleLDAPAuthenticationManagerImpl.java | 10 ---------- 1 file changed, 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ad99c10e/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 50abf4a..863f421 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,11 +317,6 @@ 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) { @@ -366,11 +361,6 @@ 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]
