From 5ab1142517e6ad680c30a0989748e90abfce4200 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 15 Jun 2011 15:43:53 +0000 Subject: [PATCH] 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 --- java/org/apache/coyote/ajp/AjpAprProcessor.java | 6 +----- java/org/apache/coyote/ajp/AjpAprProtocol.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java index 32270e808..f48a0f480 100644 --- 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 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 f74cdf217..5b6e1d6be 100644 --- 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 -- 2.11.0