You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/06/12 08:53:28 UTC

qpid-broker-j git commit: Revert "QPID-8208: [Broker-J] Strengthen handling of exception thrown on establishing of LDAP connections"

Repository: qpid-broker-j
Updated Branches:
  refs/heads/7.0.x 06c01aa94 -> 6acc91299


Revert "QPID-8208: [Broker-J] Strengthen handling of exception thrown on establishing of LDAP connections"

This reverts commit 06c01aa94dd4e71be8280c1fd218f909fddf3f15.


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/6acc9129
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/6acc9129
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/6acc9129

Branch: refs/heads/7.0.x
Commit: 6acc91299ccf6440268592d901ae45f7f3800224
Parents: 06c01aa
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Jun 12 09:52:24 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Jun 12 09:52:24 2018 +0100

----------------------------------------------------------------------
 .../auth/manager/SimpleLDAPAuthenticationManagerImpl.java | 10 ----------
 1 file changed, 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6acc9129/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: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org