From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 17 Sep 2010 14:00:10 +0000 (+0000)
Subject: NIO and APR processors don't use START/STOP so this code is unnecessary
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e3aaf9ca6631a82349f732b09a7ee86f8187f8af;p=tomcat7.0

NIO and APR processors don't use START/STOP so this code is unnecessary

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

diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java
index be74ac9fc..3a658e0b5 100644
--- a/java/org/apache/coyote/http11/Http11AprProtocol.java
+++ b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -349,8 +349,6 @@ public class Http11AprProtocol extends AbstractHttp11Protocol {
                     processor = createProcessor();
                 }
 
-                processor.action(ActionCode.START, null);
-
                 SocketState state = processor.process(socket);
                 if (state == SocketState.LONG) {
                     // Associate the connection with the processor. The next request 
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 62d92a4b1..2f99de38a 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -25,7 +25,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 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;
@@ -352,8 +351,6 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
                     processor = createProcessor();
                 }
 
-                processor.action(ActionCode.START, null);
-                
                 if (proto.endpoint.isSSLEnabled() && (proto.sslImplementation != null)) {
                     if (socket instanceof SecureNioChannel) {
                         SecureNioChannel ch = (SecureNioChannel)socket;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ae15ef9f6..bbe7840d0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -173,6 +173,10 @@
         <bug>49802</bug>: Re-factor connector pause, stop and destroy methods so
         that calling any of those methods has the expected results. (markt)
       </fix>
+      <update>
+        Various refactorings to reduce code duplication and unnecessary code in
+        the connectors. (markt)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Jasper">