Author: fhanik
Date: Mon May 28 04:40:28 2007
New Revision: 542209
URL: http://svn.apache.org/viewvc?view=rev&rev=542209
Log:
remove usage of timeout attribute
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?view=diff&rev=542209&r1=542208&r2=542209
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Mon May
28 04:40:28 2007
@@ -751,10 +751,7 @@
NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
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 (!comet) {
//reset the timeout
attach.setTimeout(endpoint.getSocketProperties().getSoTimeout());
}
@@ -900,10 +897,6 @@
NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment) key.attachment();
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());
- }
}
}
} catch (InterruptedIOException e) {
@@ -1070,7 +1063,7 @@
if ( attach!=null && attach.getComet()) {
//if this is a comet connection
//then execute the connection closure at the next selector
loop
-
request.getAttributes().remove("org.apache.tomcat.comet.timeout");
+
//request.getAttributes().remove("org.apache.tomcat.comet.timeout");
//attach.setTimeout(5000); //force a cleanup in 5 seconds
//attach.setError(true); //this has caused concurrency
errors
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
