Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0FEB01160F for ; Sun, 11 May 2014 04:33:26 +0000 (UTC) Received: (qmail 44379 invoked by uid 500); 10 May 2014 23:29:31 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 5253 invoked by uid 500); 10 May 2014 23:19:41 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 51311 invoked by uid 99); 10 May 2014 22:59:40 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 22:59:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 08 May 2014 13:28:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B0AC523889DA for ; Thu, 8 May 2014 13:27:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1593273 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11Nio2Processor.java InternalNio2InputBuffer.java Date: Thu, 08 May 2014 13:27:58 -0000 To: dev@tomcat.apache.org From: remm@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140508132758.B0AC523889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: remm Date: Thu May 8 13:27:56 2014 New Revision: 1593273 URL: http://svn.apache.org/r1593273 Log: - Improve comet keepalive cleanup (if a read pending it is not possible to interrupt it), and do the same for async. Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1593273&r1=1593272&r2=1593273&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Thu May 8 13:27:56 2014 @@ -132,9 +132,13 @@ public class Http11Nio2Processor extends if (keepAlive) { inputBuffer.nextRequest(); outputBuffer.nextRequest(); - // Following Comet processing, a read is still pending, so - // keep the processor associated - return SocketState.LONG; + if (((InternalNio2InputBuffer) inputBuffer).isPending()) { + // Following comet processing, a read is still pending, so + // keep the processor associated + return SocketState.LONG; + } else { + return SocketState.OPEN; + } } else { return SocketState.CLOSED; } @@ -144,6 +148,18 @@ public class Http11Nio2Processor extends } @Override + public SocketState asyncDispatch(SocketStatus status) { + SocketState state = super.asyncDispatch(status); + if (state == SocketState.OPEN && ((InternalNio2InputBuffer) inputBuffer).isPending()) { + // Following async processing, a read is still pending, so + // keep the processor associated + return SocketState.LONG; + } else { + return state; + } + } + + @Override protected void registerForEvent(boolean read, boolean write) { if (read) { ((InternalNio2InputBuffer) inputBuffer).registerReadInterest(); Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java?rev=1593273&r1=1593272&r2=1593273&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java Thu May 8 13:27:56 2014 @@ -124,6 +124,10 @@ public class InternalNio2InputBuffer ext interest = false; } + public boolean isPending() { + return readPending; + } + // ------------------------------------------------------ Protected Methods @Override --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org