X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FAggregatingUserAdmin.java;h=ca1fa338bab58e785dbda260e8431f908c1bd811;hb=eb4324be6ac9cdff15828a21ee7d3f6ca2f19fb9;hp=54a6d9e315c8b2a9a99ae017e4099c25f8b8ae2f;hpb=ddc70245fe7413b7341205914c91015600726b4a;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java b/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
index 54a6d9e31..ca1fa338b 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
+++ b/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
@@ -160,7 +160,7 @@ public class AggregatingUserAdmin implements UserAdmin {
 		if (!(ud instanceof AbstractUserDirectory))
 			throw new IllegalArgumentException("Only " + AbstractUserDirectory.class.getName() + " is supported");
 		AbstractUserDirectory userDirectory = (AbstractUserDirectory) ud;
-		String basePath = userDirectory.getGlobalId();
+		String basePath = userDirectory.getContext();
 		if (isSystemRolesBaseDn(basePath)) {
 			this.systemRoles = userDirectory;
 			systemRoles.setExternalRoles(this);
@@ -272,7 +272,7 @@ public class AggregatingUserAdmin implements UserAdmin {
 	}
 
 	public Set<UserDirectory> getUserDirectories() {
-		TreeSet<UserDirectory> res = new TreeSet<>((o1, o2) -> o1.getGlobalId().compareTo(o2.getGlobalId()));
+		TreeSet<UserDirectory> res = new TreeSet<>((o1, o2) -> o1.getContext().compareTo(o2.getContext()));
 		res.addAll(businessRoles.values());
 		return res;
 	}