Author: bdaw Date: 2007-05-24 08:41:21 -0400 (Thu, 24 May 2007) New Revision: 7321 Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java Log: small code cleanup Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2007-05-24 12:23:33 UTC (rev 7320) +++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2007-05-24 12:41:21 UTC (rev 7321) @@ -242,13 +242,12 @@ if (filterArgs == null) { results = getConnectionContext().createInitialContext().search(getUserSearchCtxDN(), filter, controls); - return Tools.toList(results); } else { results = getConnectionContext().createInitialContext().search(getUserSearchCtxDN(), filter, filterArgs, controls); - return Tools.toList(results); } + return Tools.toList(results); } @@ -263,14 +262,12 @@ if (filterArgs == null) { results = getConnectionContext().createInitialContext().search(userCtx, filter, controls); - merged.addAll(Tools.toList(results)); - } else { results = getConnectionContext().createInitialContext().search(userCtx, filter, filterArgs, controls); - merged.addAll(Tools.toList(results)); } + merged.addAll(Tools.toList(results)); } return merged;