Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 97437 invoked from network); 22 May 2010 10:13:36 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 May 2010 10:13:36 -0000 Received: (qmail 39134 invoked by uid 500); 22 May 2010 10:13:35 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 39077 invoked by uid 500); 22 May 2010 10:13:34 -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 39070 invoked by uid 99); 22 May 2010 10:13:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 May 2010 10:13:34 +0000 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; Sat, 22 May 2010 10:13:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 681EC23889E2; Sat, 22 May 2010 10:13:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r947276 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Date: Sat, 22 May 2010 10:13:11 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100522101311.681EC23889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Sat May 22 10:13:11 2010 New Revision: 947276 URL: http://svn.apache.org/viewvc?rev=947276&view=rev Log: o fixed serving the same search results to a syncrepl consumer twice by adding 'else' 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=947276&r1=947275&r2=947276&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 Sat May 22 10:13:11 2010 @@ -176,14 +176,14 @@ public class SearchHandler extends LdapR { LOG.debug( "Handling single reply request: {}", req ); - // check firt for the syncrepl search request control + // check first for the syncrepl search request control if ( req.getControls().containsKey( SyncRequestValueControl.CONTROL_OID ) ) { handleSyncreplSearch( session, req ); } - // First, if we have the ManageDSAIt control, go directly + // if we have the ManageDSAIt control, go directly // to the handling without pre-processing the request - if ( req.getControls().containsKey( ManageDsaITControl.CONTROL_OID ) ) + else if ( req.getControls().containsKey( ManageDsaITControl.CONTROL_OID ) ) { // If the ManageDsaIT control is present, we will // consider that the user wants to get entry which