X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fldap%2FArgeoUserDetailsContextMapper.java;h=55232648066d2368e67d39d9e799d72140367edb;hb=54ca073308e726107a5e59b50ce875ebeb43b965;hp=3bb8fb7e43410089a139a8f56821574b8d8cd1a5;hpb=baa11e2f5b077334f51f183d352e9477cc0124ff;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoUserDetailsContextMapper.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoUserDetailsContextMapper.java
index 3bb8fb7e4..552326480 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoUserDetailsContextMapper.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoUserDetailsContextMapper.java
@@ -4,8 +4,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.security.ArgeoUser;
 import org.argeo.security.UserNature;
 import org.argeo.security.core.ArgeoUserDetails;
@@ -16,8 +14,8 @@ import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.ldap.UserDetailsContextMapper;
 
 public class ArgeoUserDetailsContextMapper implements UserDetailsContextMapper {
-	private final static Log log = LogFactory
-			.getLog(ArgeoUserDetailsContextMapper.class);
+//	private final static Log log = LogFactory
+//			.getLog(ArgeoUserDetailsContextMapper.class);
 
 	private List<UserNatureMapper> userNatureMappers = new ArrayList<UserNatureMapper>();
 
@@ -27,16 +25,15 @@ public class ArgeoUserDetailsContextMapper implements UserDetailsContextMapper {
 				.first();
 		String password = new String(arr);
 
-		List<UserNature> userInfos = new ArrayList<UserNature>();
+		List<UserNature> userNatures = new ArrayList<UserNature>();
 		for (UserNatureMapper userInfoMapper : userNatureMappers) {
 			UserNature userNature = userInfoMapper.mapUserInfoFromContext(ctx);
-			if (log.isTraceEnabled())
-				log.debug("Add user nature " + userNature);
-			userInfos.add(userNature);
+			if (userNature != null)
+				userNatures.add(userNature);
 		}
 
 		return new ArgeoUserDetails(username, Collections
-				.unmodifiableList(userInfos), password, authorities);
+				.unmodifiableList(userNatures), password, authorities);
 	}
 
 	public void mapUserToContext(UserDetails user, DirContextAdapter ctx) {
@@ -45,10 +42,10 @@ public class ArgeoUserDetailsContextMapper implements UserDetailsContextMapper {
 		ctx.setAttributeValue("userPassword", user.getPassword());
 		if (user instanceof ArgeoUser) {
 			ArgeoUser argeoUser = (ArgeoUser) user;
-			for (UserNature userInfo : argeoUser.getUserNatures()) {
+			for (UserNature userNature : argeoUser.getUserNatures()) {
 				for (UserNatureMapper userInfoMapper : userNatureMappers) {
-					if (userInfoMapper.supports(userInfo)) {
-						userInfoMapper.mapUserInfoToContext(userInfo, ctx);
+					if (userInfoMapper.supports(userNature)) {
+						userInfoMapper.mapUserInfoToContext(userNature, ctx);
 						break;// use the first mapper found and no others
 					}
 				}