keycloak-aplcache

NPE if trying to update user with no attributes

11/15/2013 1:00:43 PM

Stian Thorgersen

Commit: 9e73592

Tree: f0c77cd

Parents: 1262ab7

Changes

services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java 6(+4 -2)

Details

services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java 6(+4 -2)

diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
index 46a0438..830fef1 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
@@ -67,8 +67,10 @@ public class UsersResource {
         user.setEmail(rep.getEmail());
         user.setFirstName(rep.getFirstName());
         user.setLastName(rep.getLastName());
-        for (Map.Entry<String, String> attr : rep.getAttributes().entrySet()) {
-            user.setAttribute(attr.getKey(), attr.getValue());
+        if (rep.getAttributes() != null) {
+            for (Map.Entry<String, String> attr : rep.getAttributes().entrySet()) {
+                user.setAttribute(attr.getKey(), attr.getValue());
+            }
         }
     }