Author: bdaw Date: 2008-04-03 05:01:50 -0400 (Thu, 03 Apr 2008) New Revision: 10489 Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserProfileModuleImpl.java Log: (syncing from 1.0 branch) - http://jira.jboss.com/jira/browse/JBPORTAL-1941 - http://jira.jboss.com/jira/browse/JBPORTAL-1934 Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java 2008-04-02 20:53:03 UTC (rev 10488) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java 2008-04-03 09:01:50 UTC (rev 10489) @@ -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); + } } } } Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserProfileModuleImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserProfileModuleImpl.java 2008-04-02 20:53:03 UTC (rev 10488) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserProfileModuleImpl.java 2008-04-03 09:01:50 UTC (rev 10489) @@ -187,7 +187,7 @@ throw new IdentityException("Property has read only access - cannot set: " + propertyName); } - if (!pi.getType().equals(property.getClass().getName())) + if (property != null && !pi.getType().equals(property.getClass().getName())) { throw new IdentityException("Wrong property type. Must be: " + pi.getType() + "; and found: " + property.getClass().getName()); }