Align code between connectors in preparation for pulling code up to the superclass

No need to pass the socket into the asyncDispatch() call. It will always have been set beforehand.

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

diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java
index 32270e8..f48a0f4 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpAprProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java
@@ -333,11 +333,7 @@ public class AjpAprProcessor extends AbstractAjpProcessor {
     }
 
 
-    public SocketState asyncDispatch(SocketWrapper<Long> socket,
-            SocketStatus status) {
-
-        // Setting up the socket
-        this.socket = socket;
+    public SocketState asyncDispatch(SocketStatus status) {
 
         RequestInfo rp = request.getRequestProcessor();
         try {

diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java b/java/org/apache/coyote/ajp/AjpAprProtocol.java
index f74cdf2..5b6e1d6 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpAprProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java
@@ -192,7 +192,7 @@ public class AjpAprProtocol extends AbstractAjpProtocol {
             if (processor != null) {
                 // Call the appropriate event
                 try {
-                    state = processor.asyncDispatch(socket, status);
+                    state = processor.asyncDispatch(status);
                 }
                 // Future developers: if you discover any other
                 // rare-but-nonfatal exceptions, catch them here, and log as