Author: markt
Date: Sun Nov 23 22:50:13 2014
New Revision: 1641276
URL: http://svn.apache.org/r1641276
Log:
Alternative fix for NIO2
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1641276&r1=1641275&r2=1641276&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 23
22:50:13 2014
@@ -693,7 +693,7 @@ public abstract class AbstractProtocol<S
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
connections.remove(socket);
- release(wrapper, processor, false, false);
+ release(wrapper, processor, false, true);
} else if (state == SocketState.SENDFILE) {
// Sendfile in progress. If it fails, the socket will be
// closed. If it works, the socket will be re-added to the
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1641276&r1=1641275&r2=1641276&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Sun Nov 23
22:50:13 2014
@@ -140,9 +140,6 @@ public class AjpNio2Protocol extends Abs
}
processor.recycle(isSocketClosing);
recycledProcessors.push(processor);
- if (addToPoller) {
- ((Nio2Endpoint) proto.endpoint).awaitBytes(socket);
- }
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
