Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 42947 invoked from network); 25 Aug 2008 01:57:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Aug 2008 01:57:11 -0000 Received: (qmail 81738 invoked by uid 500); 25 Aug 2008 01:57:09 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 81695 invoked by uid 500); 25 Aug 2008 01:57:09 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 81686 invoked by uid 99); 25 Aug 2008 01:57:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Aug 2008 18:57:09 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Aug 2008 01:56:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BE056238898B; Sun, 24 Aug 2008 18:56:20 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r688598 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Date: Mon, 25 Aug 2008 01:56:20 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080825015620.BE056238898B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Sun Aug 24 18:56:20 2008 New Revision: 688598 URL: http://svn.apache.org/viewvc?rev=688598&view=rev Log: a little more logging and fixing bug with size limits Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=688598&r1=688597&r2=688598&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Sun Aug 24 18:56:20 2008 @@ -274,12 +274,21 @@ private int getSearchSizeLimits( SearchRequest req, LdapSession session ) { + LOG.debug( "req size limit = {}, configured size limit = {}", req.getSizeLimit(), + ldapServer.getMaxSizeLimit() ); + // Don't bother setting size limits for administrators that don't ask for it if ( session.getCoreSession().isAnAdministrator() && req.getSizeLimit() == NO_SIZE_LIMIT ) { return NO_SIZE_LIMIT; } + // Don't bother setting size limits for administrators that don't ask for it + if ( session.getCoreSession().isAnAdministrator() ) + { + return req.getSizeLimit(); + } + /* * Non administrator based searches are limited by size if the server * has been configured with unlimited size and the request specifies @@ -351,6 +360,7 @@ req.addAbandonListener( new SearchAbandonListener( ldapServer, cursor ) ); setTimeLimitsOnCursor( req, session, cursor ); final int sizeLimit = getSearchSizeLimits( req, session ); + LOG.debug( "using {} for size limit", sizeLimit ); // Position the cursor at the beginning cursor.beforeFirst();