tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1136812 - in /tomcat/trunk/java/org/apache: coyote/ajp/AjpProtocol.java coyote/http11/Http11Protocol.java tomcat/util/net/JIoEndpoint.java
Date Fri, 17 Jun 2011 08:54:28 GMT
Author: markt
Date: Fri Jun 17 08:54:28 2011
New Revision: 1136812

URL: http://svn.apache.org/viewvc?rev=1136812&view=rev
Log:
Aligning code between connectors
Remove extra method from JIoEndpoint.Handler

Modified:
    tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
    tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1136812&r1=1136811&r2=1136812&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Fri Jun 17 08:54:28 2011
@@ -125,11 +125,6 @@ public class AjpProtocol extends Abstrac
         }
         
         @Override
-        public SocketState process(SocketWrapper<Socket> socket) {
-            return process(socket,SocketStatus.OPEN);
-        }
-
-        @Override
         public SocketState process(SocketWrapper<Socket> socket, SocketStatus status)
{
             AjpProcessor processor = connections.remove(socket);
             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=1136812&r1=1136811&r2=1136812&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Fri Jun 17 08:54:28 2011
@@ -136,11 +136,6 @@ public class Http11Protocol extends Abst
         }
 
         @Override
-        public SocketState process(SocketWrapper<Socket> socket) {
-            return process(socket,SocketStatus.OPEN);
-        }
-
-        @Override
         public SocketState process(SocketWrapper<Socket> socket, SocketStatus status)
{
             Http11Processor processor = connections.remove(socket);
             try {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=1136812&r1=1136811&r2=1136812&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Fri Jun 17 08:54:28 2011
@@ -127,7 +127,6 @@ public class JIoEndpoint extends Abstrac
      * thread local fields.
      */
     public interface Handler extends AbstractEndpoint.Handler {
-        public SocketState process(SocketWrapper<Socket> socket);
         public SocketState process(SocketWrapper<Socket> socket,
                 SocketStatus status);
         public SSLImplementation getSslImplementation(); 
@@ -305,8 +304,12 @@ public class JIoEndpoint extends Abstrac
                         state = SocketState.CLOSED;
                     }
                         
-                    if ( (state != SocketState.CLOSED) ) {
-                        state = (status==null)?handler.process(socket):handler.process(socket,status);
+                    if ((state != SocketState.CLOSED)) {
+                        if (status == null) {
+                            state = handler.process(socket, SocketStatus.OPEN);
+                        } else {
+                            state = handler.process(socket,status);
+                        }
                     }
                     if (state == SocketState.CLOSED) {
                         // Close socket



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


Mime
View raw message