Fix regression caused by default user role in user admin UI
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 20 Feb 2018 16:54:19 +0000 (17:54 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 20 Feb 2018 16:54:19 +0000 (17:54 +0100)
org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java

index 75e25f51a5514cd8d9d6e8934a95c77fcefaef02..a1e5c627f4a7a107a627bc0c481f78fd42c4b979 100644 (file)
@@ -89,7 +89,7 @@ public class UserEditor extends FormEditor {
                List<User> groups = new ArrayList<User>();
                for (String roleStr : roles) {
                        User currRole = (User) userAdmin.getRole(roleStr);
-                       if (!groups.contains(currRole))
+                       if (currRole != null && !groups.contains(currRole))
                                groups.add(currRole);
                }
                return groups;