Author: markt
Date: Fri Oct 4 10:52:24 2013
New Revision: 1529128
URL: http://svn.apache.org/r1529128
Log:
Rename method as it is used more widely than just async processing
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1529128&r1=1529127&r2=1529128&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Fri Oct
4 10:52:24 2013
@@ -522,12 +522,12 @@ public abstract class AbstractAjpProcess
} else if (actionCode == ActionCode.ASYNC_COMPLETE) {
socketWrapper.clearDispatches();
if (asyncStateMachine.asyncComplete()) {
- endpoint.processSocketAsync(socketWrapper,
SocketStatus.OPEN_READ);
+ endpoint.processSocket(socketWrapper, SocketStatus.OPEN_READ);
}
} else if (actionCode == ActionCode.ASYNC_DISPATCH) {
if (asyncStateMachine.asyncDispatch()) {
- endpoint.processSocketAsync(socketWrapper,
SocketStatus.OPEN_READ);
+ endpoint.processSocket(socketWrapper, SocketStatus.OPEN_READ);
}
} else if (actionCode == ActionCode.ASYNC_DISPATCHED) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1529128&r1=1529127&r2=1529128&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Fri Oct
4 10:52:24 2013
@@ -463,14 +463,14 @@ public class Http11AprProcessor extends
} else if (actionCode == ActionCode.COMET_END) {
comet = false;
} else if (actionCode == ActionCode.COMET_CLOSE) {
- ((AprEndpoint)endpoint).processSocketAsync(this.socketWrapper,
+ ((AprEndpoint)endpoint).processSocket(this.socketWrapper,
SocketStatus.OPEN_READ);
} else if (actionCode == ActionCode.COMET_SETTIMEOUT) {
//no op
} else if (actionCode == ActionCode.ASYNC_COMPLETE) {
socketWrapper.clearDispatches();
if (asyncStateMachine.asyncComplete()) {
- ((AprEndpoint)endpoint).processSocketAsync(this.socketWrapper,
+ ((AprEndpoint)endpoint).processSocket(this.socketWrapper,
SocketStatus.OPEN_READ);
}
} else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
@@ -481,7 +481,7 @@ public class Http11AprProcessor extends
socketWrapper.setTimeout(timeout);
} else if (actionCode == ActionCode.ASYNC_DISPATCH) {
if (asyncStateMachine.asyncDispatch()) {
- ((AprEndpoint)endpoint).processSocketAsync(this.socketWrapper,
+ ((AprEndpoint)endpoint).processSocket(this.socketWrapper,
SocketStatus.OPEN_READ);
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1529128&r1=1529127&r2=1529128&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Oct 4
10:52:24 2013
@@ -371,7 +371,7 @@ public class Http11Processor extends Abs
} else if (actionCode == ActionCode.ASYNC_COMPLETE) {
socketWrapper.clearDispatches();
if (asyncStateMachine.asyncComplete()) {
- ((JIoEndpoint) endpoint).processSocketAsync(this.socketWrapper,
+ ((JIoEndpoint) endpoint).processSocket(this.socketWrapper,
SocketStatus.OPEN_READ);
}
} else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
@@ -381,7 +381,7 @@ public class Http11Processor extends Abs
socketWrapper.setTimeout(timeout);
} else if (actionCode == ActionCode.ASYNC_DISPATCH) {
if (asyncStateMachine.asyncDispatch()) {
- ((JIoEndpoint) endpoint).processSocketAsync(this.socketWrapper,
+ ((JIoEndpoint) endpoint).processSocket(this.socketWrapper,
SocketStatus.OPEN_READ);
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1529128&r1=1529127&r2=1529128&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Fri Oct
4 10:52:24 2013
@@ -621,7 +621,15 @@ public abstract class AbstractEndpoint<S
// ---------------------------------------------- Request processing
methods
- public abstract void processSocketAsync(SocketWrapper<S> socketWrapper,
+ /**
+ * Process the given SocketWrapper with the given status. Used to trigger
+ * processing as if the Poller (for those endpoints that have one)
+ * selected the socket.
+ *
+ * @param socketWrapper The socket wrapper to process
+ * @param socketStatus The input status to the processing
+ */
+ public abstract void processSocket(SocketWrapper<S> socketWrapper,
SocketStatus socketStatus);
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1529128&r1=1529127&r2=1529128&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Oct 4
10:52:24 2013
@@ -852,7 +852,7 @@ public class AprEndpoint extends Abstrac
@Override
- public void processSocketAsync(SocketWrapper<Long> socket,
+ public void processSocket(SocketWrapper<Long> socket,
SocketStatus status) {
try {
synchronized (socket) {
@@ -1065,7 +1065,7 @@ public class AprEndpoint extends Abstrac
long access = socket.getLastAccess();
if (socket.getTimeout() > 0 &&
(now-access)>socket.getTimeout()) {
- processSocketAsync(socket,SocketStatus.TIMEOUT);
+ processSocket(socket,SocketStatus.TIMEOUT);
}
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=1529128&r1=1529127&r2=1529128&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Fri Oct 4
10:52:24 2013
@@ -169,7 +169,7 @@ public class JIoEndpoint extends Abstrac
long access = socket.getLastAccess();
if (socket.getTimeout() > 0 &&
(now-access)>socket.getTimeout()) {
- processSocketAsync(socket,SocketStatus.TIMEOUT);
+ processSocket(socket,SocketStatus.TIMEOUT);
}
}
@@ -559,7 +559,7 @@ public class JIoEndpoint extends Abstrac
* Connector.
*/
@Override
- public void processSocketAsync(SocketWrapper<Socket> socket,
+ public void processSocket(SocketWrapper<Socket> socket,
SocketStatus status) {
try {
synchronized (socket) {
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=1529128&r1=1529127&r2=1529128&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Oct 4
10:52:24 2013
@@ -604,7 +604,7 @@ public class NioEndpoint extends Abstrac
@Override
- public void processSocketAsync(SocketWrapper<NioChannel> socketWrapper,
+ public void processSocket(SocketWrapper<NioChannel> socketWrapper,
SocketStatus socketStatus) {
dispatchForEvent(socketWrapper.getSocket(), socketStatus, true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
