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

LDAP-264: Handle SizeLimitException explicitly, ignoring and aborting unless explicitly specified otherwise.

Browse Source
This commit is contained in:
Mattias Hellborg Arthursson
2013-11-18 11:51:14 +01:00
parent 74e6e62fa3
commit 98e4db9ae5
3 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
View File

@@ -37,6 +37,7 @@ import javax.naming.NameClassPair;
import javax.naming.NameNotFoundException;
import javax.naming.NamingEnumeration;
import javax.naming.PartialResultException;
import javax.naming.SizeLimitExceededException;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem;
@@ -81,6 +82,8 @@ public class LdapTemplate implements LdapOperations, InitializingBean {
private boolean ignoreNameNotFoundException = false;
private boolean ignoreSizeLimitExceededException = true;
private int defaultSearchScope = SearchControls.SUBTREE_SCOPE;
private int defaultTimeLimit = 0;
@@ -177,6 +180,19 @@ public class LdapTemplate implements LdapOperations, InitializingBean {
this.ignorePartialResultException = ignore;
}
/**
* Specify whether <code>SizeLimitExceededException</code> should be ignored in searches.
* This is typically what you want if you specify count limit in your search controls.
*
* @param ignore <code>true</code> if <code>SizeLimitExceededException</code>
* should be ignored in searches, <code>false</code> otherwise. Default is
* <code>true</code>.
* @since 2.0
*/
public void setIgnoreSizeLimitExceededException(boolean ignore) {
this.ignoreSizeLimitExceededException = ignore;
}
/**
* Set the default scope to be used in searches if not explicitly specified.
* Default is {@link SearchControls.SUBTREE_SCOPE}.
@@ -379,6 +395,14 @@ public class LdapTemplate implements LdapOperations, InitializingBean {
ex = LdapUtils.convertLdapException(e);
}
}
catch(SizeLimitExceededException e) {
if(ignoreSizeLimitExceededException) {
log.debug("SizeLimitExceededException encountered and ignored", e);
}
else {
ex = LdapUtils.convertLdapException(e);
}
}
catch (javax.naming.NamingException e) {
ex = LdapUtils.convertLdapException(e);
}
@@ -1714,8 +1738,8 @@ public class LdapTemplate implements LdapOperations, InitializingBean {
searchControls.setCountLimit(query.countLimit());
}
if(query.countLimit() != null) {
searchControls.setCountLimit(query.timeLimit());
if(query.timeLimit() != null) {
searchControls.setTimeLimit(query.timeLimit());
}
return searchControls;
}