From 63d84b84829b83acfa7100640f11aaf3c9c4c3eb Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Thu, 16 Jul 2009 17:44:02 +0000 Subject: [PATCH] Merged V3.2 to HEAD 15240: Small correction to ETHREEOH-2508 fix. Handle 'empty name' case reported in user forums. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15241 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/security/sync/ldap/LDAPUserRegistry.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java b/source/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java index cc2e451548..fe28eed1e1 100644 --- a/source/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java +++ b/source/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java @@ -546,7 +546,7 @@ public class LDAPUserRegistry implements UserRegistry, InitializingBean, Activat for (int i = 0; i < memAttribute.size(); i++) { String attribute = (String) memAttribute.get(i); - if (attribute != null) + if (attribute != null && attribute.length() > 0) { try { @@ -555,14 +555,14 @@ public class LDAPUserRegistry implements UserRegistry, InitializingBean, Activat LdapName distinguishedName = new LdapName(attribute); Attribute nameAttribute; - // If the user and group search bases are different we may be able to recognise user + // If the user and group search bases are different we may be able to recognize user // and group DNs without a secondary lookup if (disjoint) { Attributes nameAttributes = distinguishedName.getRdn( distinguishedName.size() - 1).toAttributes(); - // Recognise user DNs + // Recognize user DNs if (distinguishedName.startsWith(userDistinguishedNamePrefix) && (nameAttribute = nameAttributes.get(this.userIdAttributeName)) != null) { @@ -570,7 +570,7 @@ public class LDAPUserRegistry implements UserRegistry, InitializingBean, Activat continue; } - // Recognise group DNs + // Recognize group DNs if (distinguishedName.startsWith(groupDistinguishedNamePrefix) && (nameAttribute = nameAttributes.get(this.groupIdAttributeName)) != null) {