From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 20 Feb 2018 16:54:19 +0000 (+0100)
Subject: Fix regression caused by default user role in user admin UI
X-Git-Tag: argeo-commons-2.1.72~5
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=c0baa23e1d598338c551033d9df64de02544559d;p=lgpl%2Fargeo-commons.git

Fix regression caused by default user role in user admin UI
---

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java
index 75e25f51a..a1e5c627f 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java
@@ -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;