Author: markt
Date: Tue Sep 3 10:11:15 2013
New Revision: 1519632
URL: http://svn.apache.org/r1519632
Log:
Use new processSocketAsync() method to align actionInternal code across all
three AJP processors
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.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=1519632&r1=1519631&r2=1519632&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Tue Sep 3
10:11:15 2013
@@ -86,14 +86,12 @@ public class AjpAprProcessor extends Abs
if (actionCode == ActionCode.ASYNC_COMPLETE) {
socketWrapper.clearDispatches();
if (asyncStateMachine.asyncComplete()) {
- ((AprEndpoint)endpoint).processSocketAsync(this.socketWrapper,
- SocketStatus.OPEN_READ);
+ endpoint.processSocketAsync(socketWrapper,
SocketStatus.OPEN_READ);
}
} else if (actionCode == ActionCode.ASYNC_DISPATCH) {
if (asyncStateMachine.asyncDispatch()) {
- ((AprEndpoint)endpoint).processSocketAsync(this.socketWrapper,
- SocketStatus.OPEN_READ);
+ endpoint.processSocketAsync(socketWrapper,
SocketStatus.OPEN_READ);
}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1519632&r1=1519631&r2=1519632&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Tue Sep 3
10:11:15 2013
@@ -70,14 +70,12 @@ public class AjpNioProcessor extends Abs
if (actionCode == ActionCode.ASYNC_COMPLETE) {
socketWrapper.clearDispatches();
if (asyncStateMachine.asyncComplete()) {
- ((NioEndpoint)endpoint).dispatchForEvent(
- socketWrapper.getSocket(), SocketStatus.OPEN_READ,
true);
+ endpoint.processSocketAsync(socketWrapper,
SocketStatus.OPEN_READ);
}
} else if (actionCode == ActionCode.ASYNC_DISPATCH) {
if (asyncStateMachine.asyncDispatch()) {
- ((NioEndpoint)endpoint).dispatchForEvent(
- socketWrapper.getSocket(), SocketStatus.OPEN_READ,
true);
+ endpoint.processSocketAsync(socketWrapper,
SocketStatus.OPEN_READ);
}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1519632&r1=1519631&r2=1519632&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Sep 3
10:11:15 2013
@@ -83,14 +83,12 @@ public class AjpProcessor extends Abstra
if (actionCode == ActionCode.ASYNC_COMPLETE) {
socketWrapper.clearDispatches();
if (asyncStateMachine.asyncComplete()) {
- ((JIoEndpoint)endpoint).processSocketAsync(this.socketWrapper,
- SocketStatus.OPEN_READ);
+ endpoint.processSocketAsync(socketWrapper,
SocketStatus.OPEN_READ);
}
} else if (actionCode == ActionCode.ASYNC_DISPATCH) {
if (asyncStateMachine.asyncDispatch()) {
- ((JIoEndpoint)endpoint).processSocketAsync(this.socketWrapper,
- SocketStatus.OPEN_READ);
+ endpoint.processSocketAsync(socketWrapper,
SocketStatus.OPEN_READ);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
