X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdifUser.java;h=aaac50272a02cb605ec962521fcf77f9f873a06a;hb=d74f9b604d0132a6b66c7a2dc189be2c2798b7c4;hp=a20ad85c11fbc9a65e24e3a3921aae5a5a8a0f67;hpb=f520af45449b203a879392e8a0aeda6703abadfa;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/LdifUser.java b/org.argeo.util/src/org/argeo/osgi/useradmin/LdifUser.java index a20ad85c1..aaac50272 100644 --- a/org.argeo.util/src/org/argeo/osgi/useradmin/LdifUser.java +++ b/org.argeo.util/src/org/argeo/osgi/useradmin/LdifUser.java @@ -21,6 +21,7 @@ import javax.naming.directory.Attributes; import javax.naming.directory.BasicAttribute; import javax.naming.ldap.LdapName; +import org.argeo.util.directory.Person; import org.argeo.util.naming.LdapAttrs; import org.argeo.util.naming.LdapObjs; import org.argeo.util.naming.SharedSecret; @@ -182,14 +183,14 @@ abstract class LdifUser implements DirectoryUser { /** Should only be called from working copy thread. */ private synchronized Attributes getModifiedAttributes() { assert getWc() != null; - return getWc().getAttributes(getDn()); + return getWc().getModifiedData().get(getDn()); } protected synchronized boolean isEditing() { return getWc() != null && getModifiedAttributes() != null; } - private synchronized UserDirectoryWorkingCopy getWc() { + private synchronized DirectoryUserWorkingCopy getWc() { return userAdmin.getWorkingCopy(); }