X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fosgi%2FNodeUserAdmin.java;h=626a057c08fc82b287b91648b1321634172b9856;hb=a92b2dfe504630d7406e7ccced0cf5e9388ac03a;hp=3850010e99544dd94c77e641da774fa5b678ad67;hpb=6862cee138ca8ed2bbf6427b20b389a56b5df32f;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java index 3850010e9..626a057c0 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java @@ -148,10 +148,18 @@ public class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServic } else { throw new IllegalArgumentException("Unsupported scheme " + u.getScheme()); } + LdapName baseDn = userDirectory.getBaseDn(); + + // FIXME make updates more robust + if (pidToBaseDn.containsValue(baseDn)) { + if (log.isDebugEnabled()) + log.debug("Ignoring user directory update of " + baseDn); + return; + } + addUserDirectory(userDirectory); // OSGi - LdapName baseDn = userDirectory.getBaseDn(); Hashtable regProps = new Hashtable<>(); regProps.put(Constants.SERVICE_PID, pid); if (isSystemRolesBaseDn(baseDn))