X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdifUser.java;h=aaac50272a02cb605ec962521fcf77f9f873a06a;hb=d74f9b604d0132a6b66c7a2dc189be2c2798b7c4;hp=db83b81e47b99a9e247a1e141c6bc22b219fe964;hpb=cceead8a279e8630f63cc9e8213bdcdca39955a5;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 db83b81e4..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,10 +21,11 @@ import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttribute;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.naming.AuthPassword;
+import org.argeo.util.directory.Person;
 import org.argeo.util.naming.LdapAttrs;
 import org.argeo.util.naming.LdapObjs;
 import org.argeo.util.naming.SharedSecret;
+import org.argeo.util.naming.ldap.AuthPassword;
 
 /** Directory user implementation */
 abstract class LdifUser implements DirectoryUser {
@@ -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();
 	}