projects
/
lgpl
/
argeo-commons.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7908f61
)
Fix LDIF persistence
author
Mathieu Baudier <mbaudier@argeo.org>
Thu, 22 Feb 2024 09:02:22 +0000
(10:02 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Thu, 22 Feb 2024 09:02:22 +0000
(10:02 +0100)
org.argeo.cms/src/org/argeo/cms/directory/ldap/DefaultLdapEntry.java
patch
|
blob
|
history
org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapEntry.java
patch
|
blob
|
history
org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifDao.java
patch
|
blob
|
history
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();
}
// modifiedAttributes = (Attributes) publishedAttributes.clone();
}
-
public synchronized void publishAttributes(Attributes modifiedAttributes) {
-//
publishedAttributes = modifiedAttributes;
-
}
+
//
public synchronized void publishAttributes(Attributes modifiedAttributes) {
+//
//
publishedAttributes = modifiedAttributes;
+
//
}
/*
* PROPERTIES
/*
* 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();
Attributes getAttributes();
- void publishAttributes(Attributes modifiedAttributes);
+
//
void publishAttributes(Attributes modifiedAttributes);
List<LdapName> getReferences(String attributeId);
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);
}
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();
@Override
public void commit(LdapEntryWorkingCopy wc) {
save();