From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 22 Feb 2024 09:02:22 +0000 (+0100)
Subject: Fix LDIF persistence
X-Git-Tag: v2.3.28~41
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=e44bf237b04c529baadee4b5d0071fdff8a39ce2

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 94e0ac46d..697ad441f 100644
--- 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 fa95c9615..798c449cf 100644
--- 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 52148dfab..06489c6e2 100644
--- 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();