From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 7 Jul 2011 21:17:25 +0000 (+0000)
Subject: Post refactoring, can't be processing a comet request in asyncDispatch
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=22a33e1b875578d8f19e0740371431ac5e2c755d;p=tomcat7.0

Post refactoring, can't be processing a comet request in asyncDispatch

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

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index b35488fe7..31b6f472f 100644
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -193,21 +193,14 @@ public class Http11NioProcessor extends AbstractHttp11Processor {
             error = !adapter.asyncDispatch(request, response, status);
             if ( !error ) {
                 if (attach != null) {
-                    attach.setComet(comet);
-                    if (comet) {
-                        Integer comettimeout = (Integer) request.getAttribute("org.apache.tomcat.comet.timeout");
-                        if (comettimeout != null) attach.setTimeout(comettimeout.longValue());
-                    } else {
-                        if (asyncStateMachine.isAsyncDispatching()) {
-                            //reset the timeout
-                            if (keepAlive && keepAliveTimeout>0) {
-                                attach.setTimeout(keepAliveTimeout);
-                            } else {
-                                attach.setTimeout(soTimeout);
-                            }
+                    if (asyncStateMachine.isAsyncDispatching()) {
+                        //reset the timeout
+                        if (keepAlive && keepAliveTimeout>0) {
+                            attach.setTimeout(keepAliveTimeout);
+                        } else {
+                            attach.setTimeout(soTimeout);
                         }
                     }
-
                 }
             }
         } catch (InterruptedIOException e) {