From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 7 Jul 2011 21:23:42 +0000 (+0000)
Subject: No functional change - make it the same as BIO & APR
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3cdfbb4e45eddc0baade500163b973963f47fe00;p=tomcat7.0

No functional change - make it the same as BIO & APR

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

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index afd989b82..f857f0d51 100644
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -215,10 +215,14 @@ public class Http11NioProcessor extends AbstractHttp11Processor {
 
         if (error) {
             return SocketState.CLOSED;
-        } else if (!isAsync()) {
-            return (keepAlive)?SocketState.OPEN:SocketState.CLOSED;
-        } else {
+        } else if (isAsync()) {
             return SocketState.LONG;
+        } else {
+            if (!keepAlive) {
+                return SocketState.CLOSED;
+            } else {
+                return SocketState.OPEN;
+            }
         }
     }