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

Fix for LDAP-37: NullPointerException when performing PagedResultsControl search.

Browse Source
This commit is contained in:
Mattias Arthursson
2007-02-06 18:50:57 +00:00
parent f79341ac4e
commit 1c59ec4d80
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-ldap/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java
View File

@@ -67,6 +67,9 @@ public abstract class AbstractRequestControlDirContextProcessor implements
}
Control[] requestControls = ldapContext.getRequestControls();
if (requestControls == null) {
requestControls = new Control[0];
}
Control newControl = createRequestControl();
Control[] newControls = new Control[requestControls.length + 1];

14
spring-ldap/src/test/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessorTest.java
View File

@@ -134,6 +134,20 @@ public class AbstractRequestControlDirContextProcessorTest extends TestCase {
verify();
}
public void testPreProcess_NullControls() throws NamingException {
ldapContextControl.setDefaultMatcher(MockControl.ARRAY_MATCHER);
ldapContextControl.expectAndDefaultReturn(ldapContextMock
.getRequestControls(), null);
ldapContextMock
.setRequestControls(new Control[] { requestControlMock });
replay();
tested.preProcess(ldapContextMock);
verify();
}
public void testPreProcess_NotLdapContext() throws Exception {
try {
tested.preProcess(dirContextMock);