X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeUserAdmin.java;h=bd48bc38501f40aa21c99497a8482839946c99f8;hb=bedec814b105c1cc53f2beadfe36d76e42c9a02e;hp=416ecef6ba9942413511b595b504c0f5e449c691;hpb=137290df09ccfb49fcdfc72b611aa8d32182342c;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
index 416ecef6b..bd48bc385 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
@@ -122,8 +122,8 @@ public class NodeUserAdmin implements UserAdmin {
 
 		Dictionary<String, ?> nodeRolesProperties = UserAdminConf
 				.uriAsProperties(nodeRolesUri);
-		if (!nodeRolesProperties.get(UserAdminConf.baseDn.property())
-				.equals(baseNodeRoleDn)) {
+		if (!nodeRolesProperties.get(UserAdminConf.baseDn.property()).equals(
+				baseNodeRoleDn)) {
 			throw new CmsException("Invalid base dn for node roles");
 			// TODO deal with "mounted" roles with a different baseDN
 		}
@@ -135,7 +135,7 @@ public class NodeUserAdmin implements UserAdmin {
 		}
 		nodeRoles.setExternalRoles(this);
 		nodeRoles.init();
-		addUserAdmin(baseNodeRoleDn, (UserAdmin)nodeRoles);
+		addUserAdmin(baseNodeRoleDn, (UserAdmin) nodeRoles);
 		if (log.isTraceEnabled())
 			log.trace("Node roles enabled.");
 	}
@@ -175,7 +175,9 @@ public class NodeUserAdmin implements UserAdmin {
 
 	@Override
 	public boolean removeRole(String name) {
-		return findUserAdmin(name).removeRole(name);
+		boolean actuallyDeleted = findUserAdmin(name).removeRole(name);
+		nodeRoles.removeRole(name);
+		return actuallyDeleted;
 	}
 
 	@Override