portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1101692 - /portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/PagedSearchExecutor.java
Date Wed, 11 May 2011 00:26:52 GMT
Author: ate
Date: Wed May 11 00:26:52 2011
New Revision: 1101692

URL: http://svn.apache.org/viewvc?rev=1101692&view=rev
Log:
JS2-1251: Ensure Paging RequestControls are cleared after an Ldap PagedSearch execution

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/PagedSearchExecutor.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/PagedSearchExecutor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/PagedSearchExecutor.java?rev=1101692&r1=1101691&r2=1101692&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/PagedSearchExecutor.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/PagedSearchExecutor.java
Wed May 11 00:26:52 2011
@@ -23,6 +23,7 @@ import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
+import javax.naming.ldap.LdapContext;
 
 import org.apache.jetspeed.security.mapping.SearchResultCallbackHandler;
 import org.springframework.ldap.control.PagedResultsCookie;
@@ -143,6 +144,9 @@ public class PagedSearchExecutor impleme
             {
                 try
                 {
+                    // Make sure the Paging RequestControls are cleared again!
+                    LdapContext ldapContext = (LdapContext)ctx;
+                    ldapContext.setRequestControls(null);
                     processor.postProcess(ctx);
                 }
                 catch (NamingException e)



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message