commit f95da937d5efec568ab1a6216cfa2529b9f8b231
author Mark Emlyn David Thomas <markt@apache.org> Thu Mar 10 10:34:09 2011 +0000
committer Mark Emlyn David Thomas <markt@apache.org> Thu Mar 10 10:34:09 2011 +0000
tree ed07bb2a6166efe083b887d9bb796e81b24fb1df
parent 170332df1543a185b7a3ef8484bd90f31e431e43

status is always null, so simplify

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

java/org/apache/tomcat/util/net/AprEndpoint.java

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 3eb997d..194270b 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -760,8 +760,7 @@
             if (running) {
                 SocketWrapper<Long> wrapper =
                     new SocketWrapper<Long>(Long.valueOf(socket));
-                getExecutor().execute(
-                        new SocketWithOptionsProcessor(wrapper, null));
+                getExecutor().execute(new SocketWithOptionsProcessor(wrapper));
             }
         } catch (RejectedExecutionException x) {
             log.warn("Socket processing request was rejected for:"+socket,x);
@@ -1642,13 +1641,10 @@
     protected class SocketWithOptionsProcessor implements Runnable {
 
         protected SocketWrapper<Long> socket = null;
-        protected SocketStatus status = null;
 
 
-        public SocketWithOptionsProcessor(SocketWrapper<Long> socket,
-                SocketStatus status) {
+        public SocketWithOptionsProcessor(SocketWrapper<Long> socket) {
             this.socket = socket;
-            this.status = status;
         }
 
         @Override
@@ -1671,7 +1667,7 @@
                         socket = null;
                     }
                     // Process the request from this socket
-                    Handler.SocketState state = (status==null)?handler.process(socket):handler.asyncDispatch(socket, status);
+                    Handler.SocketState state = handler.process(socket);
                     if (state == Handler.SocketState.CLOSED) {
                         // Close socket and pool
                         destroySocket(socket.getSocket().longValue());
@@ -1683,7 +1679,8 @@
                         }
                     } else if (state == Handler.SocketState.ASYNC_END) {
                         socket.access();
-                        SocketProcessor proc = new SocketProcessor(socket, SocketStatus.OPEN);
+                        SocketProcessor proc =
+                            new SocketProcessor(socket, SocketStatus.OPEN);
                         getExecutor().execute(proc);
                     }
                 }