Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 5985 invoked from network); 12 Oct 2010 14:10:22 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 12 Oct 2010 14:10:22 -0000 Received: (qmail 59225 invoked by uid 500); 12 Oct 2010 14:10:21 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 59142 invoked by uid 500); 12 Oct 2010 14:10:20 -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 59133 invoked by uid 99); 12 Oct 2010 14:10:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Oct 2010 14:10:20 +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; Tue, 12 Oct 2010 14:10:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7AD0723888D7; Tue, 12 Oct 2010 14:09:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1021780 - /tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Date: Tue, 12 Oct 2010 14:09:59 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101012140959.7AD0723888D7@eris.apache.org> Author: markt Date: Tue Oct 12 14:09:59 2010 New Revision: 1021780 URL: http://svn.apache.org/viewvc?rev=1021780&view=rev Log: Stop async requests hanging - side effect of r1006358 Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1021780&r1=1021779&r2=1021780&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue Oct 12 14:09:59 2010 @@ -330,6 +330,7 @@ public class Http11AprProtocol extends A } finally { if (state != SocketState.LONG) { connections.remove(socket); + socket.setAsync(false); recycledProcessors.offer(processor); if (state == SocketState.OPEN) { ((AprEndpoint)proto.endpoint).getPoller().add(socket.getSocket().longValue()); @@ -364,6 +365,7 @@ public class Http11AprProtocol extends A // Need to make socket available for next processing cycle // but no need for the poller connections.put(socket, processor); + socket.setAsync(true); } else { recycledProcessors.offer(processor); } @@ -418,6 +420,7 @@ public class Http11AprProtocol extends A } if (state != SocketState.LONG && state != SocketState.ASYNC_END) { connections.remove(socket); + socket.setAsync(false); recycledProcessors.offer(result); if (state == SocketState.OPEN) { ((AprEndpoint)proto.endpoint).getPoller().add(socket.getSocket().longValue()); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org