From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 17 Jun 2011 21:41:32 +0000 (+0000)
Subject: Connector refactoring
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3be9ae779be9003c3fc65605b238507548f28eab;p=tomcat7.0

Connector refactoring
No functional change

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1137044 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java
index 7d1b49056..8cc90163d 100644
--- a/java/org/apache/coyote/http11/Http11Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Protocol.java
@@ -161,12 +161,14 @@ public class Http11Protocol extends AbstractHttp11JsseProtocol {
                     state = processor.process(socket);
                 }
 
-                if (state == SocketState.LONG) {
+                if (processor.isAsync()) {
+                    state = processor.asyncPostProcess();
+                }
+
+                if (state == SocketState.LONG ||
+                        state == SocketState.ASYNC_END) {
                     connections.put(socket, processor);
                     socket.setAsync(true);
-                    // longPoll may change socket state (e.g. to trigger a
-                    // complete or dispatch)
-                    return processor.asyncPostProcess();
                 } else {
                     socket.setAsync(false);
                     processor.recycle();