Author: markt
Date: Tue May 13 20:55:24 2014
New Revision: 1594380
URL: http://svn.apache.org/r1594380
Log:
Merge processSocket() and dispatchForEvent()
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1594380&r1=1594379&r2=1594380&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue May
13 20:55:24 2014
@@ -504,7 +504,7 @@ public class Http11NioProcessor extends
} else if (actionCode == ActionCode.ASYNC_COMPLETE) {
socketWrapper.clearDispatches();
if (asyncStateMachine.asyncComplete()) {
-
((NioEndpoint)endpoint).dispatchForEvent(this.socketWrapper.getSocket(),SocketStatus.OPEN_READ,
true);
+ endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
}
} else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
if (param==null) {
@@ -519,7 +519,7 @@ public class Http11NioProcessor extends
attach.setTimeout(timeout);
} else if (actionCode == ActionCode.ASYNC_DISPATCH) {
if (asyncStateMachine.asyncDispatch()) {
-
((NioEndpoint)endpoint).dispatchForEvent(this.socketWrapper.getSocket(),SocketStatus.OPEN_READ,
true);
+ endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
}
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1594380&r1=1594379&r2=1594380&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue May 13
20:55:24 2014
@@ -604,14 +604,11 @@ public class NioEndpoint extends Abstrac
@Override
public void processSocket(SocketWrapper<NioChannel> socketWrapper,
SocketStatus socketStatus, boolean dispatch) {
- dispatchForEvent(socketWrapper.getSocket(), socketStatus, dispatch);
- }
-
- public void dispatchForEvent(NioChannel socket, SocketStatus status,
boolean dispatch) {
- if (dispatch && status == SocketStatus.OPEN_READ) {
+ NioChannel socket = socketWrapper.getSocket();
+ if (dispatch && socketStatus == SocketStatus.OPEN_READ) {
socket.getPoller().add(socket, OP_CALLBACK);
} else {
- processSocket(socket,status,dispatch);
+ processSocket(socket, socketStatus, dispatch);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
