From 402cbc1b06e74e691071604d10c964a3338e14ad Mon Sep 17 00:00:00 2001 From: fhanik Date: Mon, 28 May 2007 11:40:28 +0000 Subject: [PATCH] remove usage of timeout attribute git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@542209 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/Http11NioProcessor.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java index f8c3c223a..13bf343d1 100644 --- a/java/org/apache/coyote/http11/Http11NioProcessor.java +++ b/java/org/apache/coyote/http11/Http11NioProcessor.java @@ -751,10 +751,7 @@ public class Http11NioProcessor implements ActionHook { 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 @@ public class Http11NioProcessor implements ActionHook { 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 @@ public class Http11NioProcessor implements ActionHook { 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 } -- 2.11.0