Revert "QPID-8208: [Broker-J] Strengthen handling of exception thrown on establishing of LDAP connections"
This reverts commit 06c01aa94dd4e71be8280c1fd218f909fddf3f15.
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 @@
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 @@
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)
