Author: markt
Date: Fri May 3 16:01:53 2013
New Revision: 1478852
URL: http://svn.apache.org/r1478852
Log:
Pull up read event registration
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1478852&r1=1478851&r2=1478852&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Fri
May 3 16:01:53 2013
@@ -813,6 +813,8 @@ public abstract class AbstractHttp11Proc
} else if (actionCode == ActionCode.NB_WRITE_INTEREST) {
AtomicBoolean isReady = (AtomicBoolean)param;
isReady.set(getOutputBuffer().isReady());
+ } else if (actionCode == ActionCode.NB_READ_INTEREST) {
+ registerForEvent(true, false);
} else if (actionCode == ActionCode.UPGRADE) {
httpUpgradeHandler = (HttpUpgradeHandler) param;
// Stop further HTTP output
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=1478852&r1=1478851&r2=1478852&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Fri May
3 16:01:53 2013
@@ -525,17 +525,6 @@ public class Http11NioProcessor extends
}
} else if (actionCode == ActionCode.SET_WRITE_LISTENER) {
outputBuffer.setBlocking(false);
- } else if (actionCode == ActionCode.NB_READ_INTEREST) {
- if (socket==null || socket.getSocket().getAttachment(false)==null)
{
- return;
- }
- RequestInfo rp = request.getRequestProcessor();
- if (rp.getStage() == org.apache.coyote.Constants.STAGE_SERVICE) {
- NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getSocket().getAttachment(false);
- attach.interestOps(attach.interestOps() |
SelectionKey.OP_READ);
- } else {
- throw new IllegalStateException("Calling isReady
asynchronously is illegal.");
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
