inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
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
This commit is contained in:
Dave Ward
2009-07-16 17:44:02 +00:00
parent 7e95d1e5c8
commit 63d84b8482
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
View File

@@ -546,7 +546,7 @@ public class LDAPUserRegistry implements UserRegistry, InitializingBean, Activat
for (int i = 0; i < memAttribute.size(); i++) for (int i = 0; i < memAttribute.size(); i++)
{ {
String attribute = (String) memAttribute.get(i); String attribute = (String) memAttribute.get(i);
if (attribute != null) if (attribute != null && attribute.length() > 0)
{ {
try try
{ {
@@ -555,14 +555,14 @@ public class LDAPUserRegistry implements UserRegistry, InitializingBean, Activat
LdapName distinguishedName = new LdapName(attribute); LdapName distinguishedName = new LdapName(attribute);
Attribute nameAttribute; 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 // and group DNs without a secondary lookup
if (disjoint) if (disjoint)
{ {
Attributes nameAttributes = distinguishedName.getRdn( Attributes nameAttributes = distinguishedName.getRdn(
distinguishedName.size() - 1).toAttributes(); distinguishedName.size() - 1).toAttributes();
// Recognise user DNs // Recognize user DNs
if (distinguishedName.startsWith(userDistinguishedNamePrefix) if (distinguishedName.startsWith(userDistinguishedNamePrefix)
&& (nameAttribute = nameAttributes.get(this.userIdAttributeName)) != null) && (nameAttribute = nameAttributes.get(this.userIdAttributeName)) != null)
{ {
@@ -570,7 +570,7 @@ public class LDAPUserRegistry implements UserRegistry, InitializingBean, Activat
continue; continue;
} }
// Recognise group DNs // Recognize group DNs
if (distinguishedName.startsWith(groupDistinguishedNamePrefix) if (distinguishedName.startsWith(groupDistinguishedNamePrefix)
&& (nameAttribute = nameAttributes.get(this.groupIdAttributeName)) != null) && (nameAttribute = nameAttributes.get(this.groupIdAttributeName)) != null)
{ {