From eed51a9447b1072ff739f9732cb659720fcf8485 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 4 Dec 2012 15:06:42 +0000 Subject: [PATCH] not use a RuntimeException when fail to connect to ldap exception is not know by caller methods git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1416978 13f79535-47bb-0310-9956-ffa450edef68 --- .../ldap/LdapBindAuthenticator.java | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java index fa50c465..56b86b13 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java @@ -94,23 +94,25 @@ public class LdapBindAuthenticator ctls.setDerefLinkFlag( true ); ctls.setSearchScope( SearchControls.SUBTREE_SCOPE ); - String filter = "(&(objectClass=" + mapper.getUserObjectClass() + ")" - + ( mapper.getUserFilter() != null ? mapper.getUserFilter() : "" ) + "(" + mapper.getUserIdAttribute() + "=" - + source.getPrincipal() + "))"; + String filter = "(&(objectClass=" + mapper.getUserObjectClass() + ")" + ( mapper.getUserFilter() != null + ? mapper.getUserFilter() + : "" ) + "(" + mapper.getUserIdAttribute() + "=" + source.getPrincipal() + "))"; log.debug( "Searching for users with filter: '{}' from base dn: {}", filter, mapper.getUserBaseDn() ); - - LdapConnection ldapConnection = getLdapConnection(); + + LdapConnection ldapConnection = null; LdapConnection authLdapConnection = null; NamingEnumeration results = null; try { + ldapConnection = getLdapConnection(); // check the cache for user's userDn in the ldap server String userDn = ldapCacheService.getLdapUserDn( source.getPrincipal() ); - - if( userDn == null ) + + if ( userDn == null ) { - log.debug( "userDn for user {} not found in cache. Retrieving from ldap server..", source.getPrincipal() ); + log.debug( "userDn for user {} not found in cache. Retrieving from ldap server..", + source.getPrincipal() ); DirContext context = ldapConnection.getDirContext(); @@ -168,16 +170,9 @@ public class LdapBindAuthenticator } private LdapConnection getLdapConnection() + throws LdapException { - try - { - return connectionFactory.getConnection(); - } - catch ( LdapException e ) - { - log.warn( "failed to get a ldap connection " + e.getMessage(), e ); - throw new RuntimeException( "failed to get a ldap connection " + e.getMessage(), e ); - } + return connectionFactory.getConnection(); } private void closeLdapConnection( LdapConnection ldapConnection )