tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r998141 - in /tomcat/trunk: java/org/apache/coyote/http11/Http11AprProtocol.java java/org/apache/coyote/http11/Http11NioProtocol.java webapps/docs/changelog.xml
Date Fri, 17 Sep 2010 14:00:10 GMT
Author: markt
Date: Fri Sep 17 14:00:10 2010
New Revision: 998141

URL: http://svn.apache.org/viewvc?rev=998141&view=rev
Log:
NIO and APR processors don't use START/STOP so this code is unnecessary

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=998141&r1=998140&r2=998141&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Fri Sep 17 14:00:10
2010
@@ -349,8 +349,6 @@ public class Http11AprProtocol extends A
                     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 

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=998141&r1=998140&r2=998141&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Fri Sep 17 14:00:10
2010
@@ -25,7 +25,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;
@@ -352,8 +351,6 @@ public class Http11NioProtocol extends A
                     processor = createProcessor();
                 }
 
-                processor.action(ActionCode.START, null);
-                
                 if (proto.endpoint.isSSLEnabled() && (proto.sslImplementation !=
null)) {
                     if (socket instanceof SecureNioChannel) {
                         SecureNioChannel ch = (SecureNioChannel)socket;

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=998141&r1=998140&r2=998141&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Sep 17 14:00:10 2010
@@ -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">



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


Mime
View raw message