tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r998143 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11Processor.java Http11Protocol.java
Date Fri, 17 Sep 2010 14:08:10 GMT
Author: markt
Date: Fri Sep 17 14:08:10 2010
New Revision: 998143

URL: http://svn.apache.org/viewvc?rev=998143&view=rev
Log:
Remove START/STOP actions and started attribute. They aren't adding anything.

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=998143&r1=998142&r2=998143&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Sep 17 14:08:10 2010
@@ -105,12 +105,6 @@ public class Http11Processor extends Abs
 
     
     /**
-     * State flag.
-     */
-    protected boolean started = false;
-
-
-    /**
      * Socket associated with the current connection.
      */
     protected SocketWrapper<Socket> socket;
@@ -184,7 +178,7 @@ public class Http11Processor extends Abs
 
         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 Abs
                 error = true;
             }
 
-        } else if (actionCode == ActionCode.START) {
-
-            started = true;
-
-        } else if (actionCode == ActionCode.STOP) {
-
-            started = false;
-
         } else if (actionCode == ActionCode.REQ_SSL_ATTRIBUTE ) {
 
             try {

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=998143&r1=998142&r2=998143&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Fri Sep 17 14:08:10 2010
@@ -26,7 +26,6 @@ import java.util.concurrent.atomic.Atomi
 
 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 Abst
                 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 Abst
                 //                processor.recycle();
 
                 if (recycle) {
-                    processor.action(ActionCode.STOP, null);
                     recycledProcessors.offer(processor);
                 }
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message