Connector refactoring

Rename socketWrapper to socket to align with BIO/APR

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

diff --git a/java/org/apache/coyote/ajp/AjpNioProtocol.java b/java/org/apache/coyote/ajp/AjpNioProtocol.java
index 7b011fb..bbdad55 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpNioProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpNioProtocol.java
@@ -168,11 +168,11 @@ public class AjpNioProtocol extends AbstractAjpProtocol {
         }
 
         @Override
-        public SocketState process(SocketWrapper<NioChannel> socketWrapper,
+        public SocketState process(SocketWrapper<NioChannel> socket,
                 SocketStatus status) {
-            AjpNioProcessor processor = connections.remove(socketWrapper);
+            AjpNioProcessor processor = connections.remove(socket);
 
-            socketWrapper.setAsync(false); //no longer check for timeout
+            socket.setAsync(false); //no longer check for timeout
 
             try {
                 if (processor == null) {
@@ -187,7 +187,7 @@ public class AjpNioProtocol extends AbstractAjpProtocol {
                     if (processor.isAsync() || state == SocketState.ASYNC_END) {
                         state = processor.asyncDispatch(status);
                     } else {
-                        state = processor.process(socketWrapper.getSocket());
+                        state = processor.process(socket.getSocket());
                     }
 
                     if (processor.isAsync()) {
@@ -198,17 +198,17 @@ public class AjpNioProtocol extends AbstractAjpProtocol {
                 if (state == SocketState.LONG) {
                     // In the middle of processing a request/response. Keep the
                     // socket associated with the processor.
-                    connections.put(socketWrapper, processor);
+                    connections.put(socket, processor);
                     
-                    socketWrapper.setAsync(true);
+                    socket.setAsync(true);
                 } else if (state == SocketState.OPEN){
                     // In keep-alive but between requests. OK to recycle
                     // processor. Continue to poll for the next request.
-                    release(socketWrapper, processor);
-                    socketWrapper.getSocket().getPoller().add(socketWrapper.getSocket());
+                    release(socket, processor);
+                    socket.getSocket().getPoller().add(socket.getSocket());
                 } else {
                     // Connection closed. OK to recycle the processor.
-                    release(socketWrapper, processor);
+                    release(socket, processor);
                 }
                 return state;
 
@@ -231,7 +231,7 @@ public class AjpNioProtocol extends AbstractAjpProtocol {
                 // less-than-verbose logs.
                 log.error(sm.getString("ajpprotocol.proto.error"), e);
             }
-            release(socketWrapper, processor);
+            release(socket, processor);
             return SocketState.CLOSED;
         }
 

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 6f27bde..6158e77 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -231,11 +231,11 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
 
 
         @Override
-        public SocketState process(SocketWrapper<NioChannel> socketWrapper,
+        public SocketState process(SocketWrapper<NioChannel> socket,
                 SocketStatus status) {
-            Http11NioProcessor processor = connections.remove(socketWrapper);
+            Http11NioProcessor processor = connections.remove(socket);
 
-            socketWrapper.setAsync(false); //no longer check for timeout
+            socket.setAsync(false); //no longer check for timeout
 
             try {
                 if (processor == null) {
@@ -247,8 +247,8 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
 
                 if (proto.isSSLEnabled() &&
                         (proto.sslImplementation != null)
-                        && (socketWrapper.getSocket() instanceof SecureNioChannel)) {
-                    SecureNioChannel ch = (SecureNioChannel)socketWrapper.getSocket();
+                        && (socket.getSocket() instanceof SecureNioChannel)) {
+                    SecureNioChannel ch = (SecureNioChannel)socket.getSocket();
                     processor.setSslSupport(
                             proto.sslImplementation.getSSLSupport(
                                     ch.getSslEngine().getSession()));
@@ -263,7 +263,7 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
                     } else if (processor.comet) {
                         state = processor.event(status);
                     } else {
-                        state = processor.process(socketWrapper.getSocket());
+                        state = processor.process(socket.getSocket());
                     }
 
                     if (processor.isAsync()) {
@@ -274,29 +274,29 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
                 if (state == SocketState.LONG) {
                     // In the middle of processing a request/response. Keep the
                     // socket associated with the processor.
-                    connections.put(socketWrapper, processor);
+                    connections.put(socket, processor);
                     
                     if (processor.isAsync()) {
-                        socketWrapper.setAsync(true);
+                        socket.setAsync(true);
                     } else {
                         // Either:
                         //  - this is comet request
                         //  - the request line/headers have not been completely
                         //    read
-                        SelectionKey key = socketWrapper.getSocket().getIOChannel().keyFor(
-                                socketWrapper.getSocket().getPoller().getSelector());
+                        SelectionKey key = socket.getSocket().getIOChannel().keyFor(
+                                socket.getSocket().getPoller().getSelector());
                         key.interestOps(SelectionKey.OP_READ);
-                        ((KeyAttachment) socketWrapper).interestOps(
+                        ((KeyAttachment) socket).interestOps(
                                 SelectionKey.OP_READ);
                     }
                 } else if (state == SocketState.OPEN){
                     // In keep-alive but between requests. OK to recycle
                     // processor. Continue to poll for the next request.
-                    release(socketWrapper, processor);
-                    socketWrapper.getSocket().getPoller().add(socketWrapper.getSocket());
+                    release(socket, processor);
+                    socket.getSocket().getPoller().add(socket.getSocket());
                 } else {
                     // Connection closed. OK to recycle the processor.
-                    release(socketWrapper, processor);
+                    release(socket, processor);
                 }
                 return state;
 
@@ -319,7 +319,7 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
                 // less-than-verbose logs.
                 log.error(sm.getString("http11protocol.proto.error"), e);
             }
-            release(socketWrapper, processor);
+            release(socket, processor);
             return SocketState.CLOSED;
         }