Prepare next development cycle

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / osgi / NodeUserAdmin.java

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 d9524e89752cc88da682c8809977386c2b87f321..626a057c08fc82b287b91648b1321634172b9856 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java
@@ -111,10 +111,10 @@ public class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServic
 //             }
        }
 
-       public void init() {
+       public void start() {
        }
 
-       public void destroy() {
+       public void stop() {
        }
 
        @Override
@@ -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<String, Object> regProps = new Hashtable<>();
                regProps.put(Constants.SERVICE_PID, pid);
                if (isSystemRolesBaseDn(baseDn))