From: markt Date: Fri, 17 Sep 2010 14:08:10 +0000 (+0000) Subject: Remove START/STOP actions and started attribute. They aren't adding anything. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=8b128bd4e8ac47051f51898a56db8be83b870eaa;p=tomcat7.0 Remove START/STOP actions and started attribute. They aren't adding anything. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@998143 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java index 22e08738b..5b056ac3f 100644 --- a/java/org/apache/coyote/http11/Http11Processor.java +++ b/java/org/apache/coyote/http11/Http11Processor.java @@ -105,12 +105,6 @@ public class Http11Processor extends AbstractHttp11Processor implements ActionHo /** - * State flag. - */ - protected boolean started = false; - - - /** * Socket associated with the current connection. */ protected SocketWrapper socket; @@ -184,7 +178,7 @@ public class Http11Processor extends AbstractHttp11Processor implements ActionHo boolean keptAlive = socketWrapper.isKeptAlive(); - while (started && !error && keepAlive && !endpoint.isPaused()) { + while (!error && keepAlive && !endpoint.isPaused()) { // Parsing the request header try { @@ -397,14 +391,6 @@ public class Http11Processor extends AbstractHttp11Processor implements ActionHo error = true; } - } else if (actionCode == ActionCode.START) { - - started = true; - - } else if (actionCode == ActionCode.STOP) { - - started = false; - } else if (actionCode == ActionCode.REQ_SSL_ATTRIBUTE ) { try { diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java index e49a10271..7ba195cec 100644 --- a/java/org/apache/coyote/http11/Http11Protocol.java +++ b/java/org/apache/coyote/http11/Http11Protocol.java @@ -26,7 +26,6 @@ import java.util.concurrent.atomic.AtomicLong; import javax.management.ObjectName; -import org.apache.coyote.ActionCode; import org.apache.coyote.RequestGroupInfo; import org.apache.coyote.RequestInfo; import org.apache.juli.logging.Log; @@ -246,7 +245,6 @@ public class Http11Protocol extends AbstractHttp11JsseProtocol { if (processor == null) { processor = createProcessor(); } - processor.action(ActionCode.START, null); if (proto.isSSLEnabled() && (proto.sslImplementation != null)) { processor.setSSLSupport @@ -290,7 +288,6 @@ public class Http11Protocol extends AbstractHttp11JsseProtocol { // processor.recycle(); if (recycle) { - processor.action(ActionCode.STOP, null); recycledProcessors.offer(processor); } }