Author: markt
Date: Wed May 20 19:16:02 2015
New Revision: 1680658
URL: http://svn.apache.org/r1680658
Log:
Relax the requirement that the socket has to be in waiting requests. (HTTP/2
needs this).
Remove it if it is there but always process.
If the socket is closed SocketProcessor.run will exit early.
This test may have been aimed at working around multiple registrations but
those issues should have been fixed at source now.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
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=1680658&r1=1680657&r2=1680658&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed May 20
19:16:02 2015
@@ -907,14 +907,13 @@ public class AprEndpoint extends Abstrac
// result of calling AsyncContext.dispatch() from a non-container
// thread
synchronized (socket) {
- if (waitingRequests.remove(socket)) {
- SocketProcessor proc = new SocketProcessor(socket, status);
- Executor executor = getExecutor();
- if (dispatch && executor != null) {
- executor.execute(proc);
- } else {
- proc.run();
- }
+ waitingRequests.remove(socket);
+ SocketProcessor proc = new SocketProcessor(socket, status);
+ Executor executor = getExecutor();
+ if (dispatch && executor != null) {
+ executor.execute(proc);
+ } else {
+ proc.run();
}
}
} catch (RejectedExecutionException ree) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
