Author: markt
Date: Wed Jun 15 15:43:53 2011
New Revision: 1136090
URL: http://svn.apache.org/viewvc?rev=1136090&view=rev
Log:
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.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1136090&r1=1136089&r2=1136090&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Wed Jun 15
15:43:53 2011
@@ -333,11 +333,7 @@ public class AjpAprProcessor extends Abs
}
- 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 {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1136090&r1=1136089&r2=1136090&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Wed Jun 15
15:43:53 2011
@@ -192,7 +192,7 @@ public class AjpAprProtocol extends Abst
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
