Connector re-factoring

No functional change

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

diff --git a/java/org/apache/coyote/ajp/AjpNioProtocol.java b/java/org/apache/coyote/ajp/AjpNioProtocol.java
index 03f6c52..ce6a9ce 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpNioProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpNioProtocol.java
@@ -207,7 +207,7 @@ public class AjpNioProtocol extends AbstractAjpProtocol {
         }
         
         @Override
-        public SocketState process(NioChannel socket) {
+        public SocketState process(NioChannel socket, SocketStatus status) {
             AjpNioProcessor processor = connections.remove(socket);
             try {
                 if (processor == null) {

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index f28f633..9c215ed 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -293,7 +293,7 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
         }
 
         @Override
-        public SocketState process(NioChannel socket) {
+        public SocketState process(NioChannel socket, SocketStatus status) {
             Http11NioProcessor processor = connections.remove(socket);
             try {
                 if (processor == null) {

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 6e1e850..f4e8e18 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1482,7 +1482,7 @@ public class NioEndpoint extends AbstractEndpoint {
      * thread local fields.
      */
     public interface Handler extends AbstractEndpoint.Handler {
-        public SocketState process(NioChannel socket);
+        public SocketState process(NioChannel socket, SocketStatus status);
         public SocketState event(NioChannel socket, SocketStatus status);
         public void release(NioChannel socket);
         public void release(SocketChannel socket);
@@ -1529,7 +1529,11 @@ public class NioEndpoint extends AbstractEndpoint {
                     if ( handshake == 0 ) {
                         SocketState state = SocketState.OPEN;
                         // Process the request from this socket
-                        state = (status==null)?handler.process(socket):handler.event(socket,status);
+                        if (status == null) {
+                            state = handler.process(socket, SocketStatus.OPEN);
+                        } else {
+                            state = handler.event(socket, status);
+                        }
     
                         if (state == SocketState.CLOSED) {
                             // Close socket and pool