Fix LDIF persistence

diff --git a/org.argeo.cms/src/org/argeo/cms/directory/ldap/DefaultLdapEntry.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/DefaultLdapEntry.java
index 94e0ac46def207abecdfeb66743cbc77e45002c2..697ad441fb89f4887d6de83563cd63166bbae3b5 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/directory/ldap/DefaultLdapEntry.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/DefaultLdapEntry.java
@@ -125,9 +125,9 @@ public class DefaultLdapEntry implements LdapEntry {
                // modifiedAttributes = (Attributes) publishedAttributes.clone();
        }
 
-       public synchronized void publishAttributes(Attributes modifiedAttributes) {
-//             publishedAttributes = modifiedAttributes;
-       }
+//     public synchronized void publishAttributes(Attributes modifiedAttributes) {
+////           publishedAttributes = modifiedAttributes;
+//     }
 
        /*
         * PROPERTIES

diff --git a/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapEntry.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapEntry.java
index fa95c961542d245598a83f5918e921cfc09b191f..798c449cf9b61c98e699bbe1c8c28b1742bacf48 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapEntry.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapEntry.java
@@ -20,7 +20,7 @@ public interface LdapEntry {
 
        Attributes getAttributes();
 
-       void publishAttributes(Attributes modifiedAttributes);
+       //void publishAttributes(Attributes modifiedAttributes);
 
        List<LdapName> getReferences(String attributeId);
 

diff --git a/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifDao.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifDao.java
index 52148dfab6084f695b69dcbb8b9b2b79e3a71dc6..06489c6e2dbc052b433581579fbe309179a8842c 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifDao.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifDao.java
@@ -257,10 +257,14 @@ public class LdifDao extends AbstractLdapDirectoryDao {
                        }
                        if (user == null)
                                throw new IllegalStateException("User to modify no found " + dn);
-                       user.publishAttributes(modifiedAttrs);
+                       publishAttributes(dn, modifiedAttrs);
                }
        }
 
+       protected void publishAttributes(LdapName dn, Attributes modifiedAttributes) {
+               values.put(dn, modifiedAttributes);
+       }
+
        @Override
        public void commit(LdapEntryWorkingCopy wc) {
                save();