Author: bdaw
Date: 2008-04-01 05:02:25 -0400 (Tue, 01 Apr 2008)
New Revision: 10451
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java
Log:
http://jira.jboss.com/jira/browse/JBPORTAL-1941
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java
===================================================================
---
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java 2008-04-01
06:58:43 UTC (rev 10450)
+++
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java 2008-04-01
09:02:25 UTC (rev 10451)
@@ -170,39 +170,46 @@
Attributes attrs = ldapContext.getAttributes(ldapRole.getDn());
//log.debug("Role attributes: " + attrs);
- if (attrs == null )
+ if (attrs == null)
{
throw new IdentityException("Cannot find Role with DN: " +
ldapRole.getDn());
}
//iterate over user names belonging to this role
- NamingEnumeration values = attrs.get(getMemberAttributeID()).getAll();
- while (values.hasMoreElements())
+ Attribute memberAttr = attrs.get(getMemberAttributeID());
+
+ if (memberAttr != null)
{
- String value = values.nextElement().toString();
- String name = value;
- if (userNameFilter != null && userNameFilter.length() != 0 &&
!name.matches(".*" + userNameFilter + ".*"))
+ NamingEnumeration values = memberAttr.getAll();
+
+ while (values.hasMoreElements())
{
- continue;
- }
+ String value = values.nextElement().toString();
+ String name = value;
- try
- {
- //if user is pointed as DN get only it's name
- if (isUidAttributeIsDN())
+ if (userNameFilter != null && userNameFilter.length() != 0
&& !name.matches(".*" + userNameFilter + ".*"))
{
- users.add(getUserModule().findUserByDN(name));
+ continue;
}
- else
+
+ try
{
- users.add(getUserModule().findUserByUserName(name));
+ //if user is pointed as DN get only it's name
+ if (isUidAttributeIsDN())
+ {
+ users.add(getUserModule().findUserByDN(name));
+ }
+ else
+ {
+ users.add(getUserModule().findUserByUserName(name));
+ }
}
- }
- catch(IdentityException ie)
- {
- log.error("Failed to find user: " + name + "/" +
value, ie);
+ catch(IdentityException ie)
+ {
+ log.error("Failed to find user: " + name + "/" +
value, ie);
+ }
}
}
}