Aligning code between connectors

Remove extra method from JIoEndpoint.Handler

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

diff --git a/java/org/apache/coyote/ajp/AjpProtocol.java b/java/org/apache/coyote/ajp/AjpProtocol.java
index e9af917..bcbb597 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpProtocol.java
@@ -125,11 +125,6 @@ public class AjpProtocol extends AbstractAjpProtocol {
         }
         
         @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 {

diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java
index faca23a..214a8f6 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Protocol.java
@@ -136,11 +136,6 @@ public class Http11Protocol extends AbstractHttp11JsseProtocol {
         }
 
         @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 {

diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java
index cbff57b..17a10c1 100644 (file)
--- a/java/org/apache/tomcat/util/net/JIoEndpoint.java
+++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java
@@ -127,7 +127,6 @@ public class JIoEndpoint extends AbstractEndpoint {
      * 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 AbstractEndpoint {
                         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