tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1021780 - /tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Date Tue, 12 Oct 2010 14:09:59 GMT
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


Mime
View raw message