Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LDAP-304: Check for modify null attribute

Browse Source
This commit is contained in:
Rob Winch
2015-04-27 10:28:47 -05:00
parent 439da97988
commit ac7b89261c
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
View File

@@ -333,7 +333,7 @@ public class DirContextAdapter implements DirContextOperations {
private void collectModifications(NameAwareAttribute changedAttr,
List<ModificationItem> modificationList) throws NamingException {
NameAwareAttribute currentAttribute = originalAttrs.get(changedAttr.getID());
if(changedAttr.hasValuesAsNames()) {
if(currentAttribute != null && changedAttr.hasValuesAsNames()) {
try {
currentAttribute.initValuesAsNames();
} catch(IllegalArgumentException e) {

12
core/src/test/java/org/springframework/ldap/core/DirContextAdapterTest.java
View File

@@ -571,6 +571,18 @@ public class DirContextAdapterTest {
assertEquals("123", (String) attr.get());
}
// LDAP-304
@Test
public void testModifyNull() throws Exception {
tested.setAttributeValue("memberDN", null);
tested.setUpdateMode(true);
assertTrue(tested.isUpdateMode());
tested.setAttributeValue("memberDN", new LdapName("ou=test"));
ModificationItem[] mods = tested.getModificationItems();
assertEquals(1, mods.length);
}
@Test
public void testGetDn() throws Exception {
DirContextAdapter tested = new DirContextAdapter(DUMMY_NAME);