Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 67123 invoked from network); 25 Aug 2008 02:45:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Aug 2008 02:45:05 -0000 Received: (qmail 90106 invoked by uid 500); 25 Aug 2008 02:45:04 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 90069 invoked by uid 500); 25 Aug 2008 02:45:04 -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 90060 invoked by uid 99); 25 Aug 2008 02:45:04 -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 19:45:04 -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 02:44:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 03C2F238898B; Sun, 24 Aug 2008 19:44:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r688603 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Date: Mon, 25 Aug 2008 02:44:14 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080825024415.03C2F238898B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Sun Aug 24 19:44:14 2008 New Revision: 688603 URL: http://svn.apache.org/viewvc?rev=688603&view=rev Log: improving responsiveness of search to client death 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=688603&r1=688602&r2=688603&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 19:44:14 2008 @@ -55,6 +55,9 @@ import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.util.LdapURL; +import org.apache.mina.common.IoService; +import org.apache.mina.common.TrafficMask; +import org.apache.mina.common.WriteFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -369,6 +372,10 @@ { while ( cursor.next() ) { + if ( session.getIoSession().isClosing() ) + { + break; + } ClonedServerEntry entry = cursor.get(); session.getIoSession().write( generateResponse( session, req, entry ) ); } @@ -378,6 +385,10 @@ int count = 0; while ( cursor.next() ) { + if ( session.getIoSession().isClosing() ) + { + break; + } if ( count < sizeLimit ) { ClonedServerEntry entry = cursor.get();