Author: markt
Date: Thu Jul 7 21:17:25 2011
New Revision: 1144045
URL: http://svn.apache.org/viewvc?rev=1144045&view=rev
Log:
Post refactoring, can't be processing a comet request in asyncDispatch
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1144045&r1=1144044&r2=1144045&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Jul
7 21:17:25 2011
@@ -193,21 +193,14 @@ public class Http11NioProcessor extends
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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
