Introduce transaction working copy abstraction

[lgpl/argeo-commons.git] / org.argeo.util / src / org / argeo / osgi / useradmin / LdifUser.java

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 a20ad85c11fbc9a65e24e3a3921aae5a5a8a0f67..aaac50272a02cb605ec962521fcf77f9f873a06a 100644 (file)
--- 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();
        }