Author: remm
Date: Wed May 27 07:52:49 2015
New Revision: 1681925
URL: http://svn.apache.org/r1681925
Log:
Try reverting r1681794
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1681925&r1=1681924&r2=1681925&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Wed May
27 07:52:49 2015
@@ -22,6 +22,7 @@ import org.apache.juli.logging.LogFactor
import org.apache.tomcat.util.net.Nio2Channel;
import org.apache.tomcat.util.net.Nio2Endpoint;
import org.apache.tomcat.util.net.Nio2Endpoint.Handler;
+import org.apache.tomcat.util.net.Nio2Endpoint.Nio2SocketWrapper;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -108,8 +109,9 @@ public class Http11Nio2Protocol extends
if (socket.isAsync()) {
((Nio2Endpoint)
getProtocol().getEndpoint()).removeTimeout(socket);
}
- // No need to add to poller. read() will have already been called
- // with an appropriate completion handler.
+ if (addToPoller) {
+ ((Nio2SocketWrapper) socket).awaitBytes();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
