Author: markt
Date: Tue May 26 17:20:12 2015
New Revision: 1681794
URL: http://svn.apache.org/r1681794
Log:
Fix NIO2 test failures.
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=1681794&r1=1681793&r2=1681794&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Tue May
26 17:20:12 2015
@@ -22,7 +22,6 @@ 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;
@@ -109,9 +108,8 @@ public class Http11Nio2Protocol extends
if (socket.isAsync()) {
((Nio2Endpoint)
getProtocol().getEndpoint()).removeTimeout(socket);
}
- if (addToPoller) {
- ((Nio2SocketWrapper) socket).awaitBytes();
- }
+ // No need to add to poller. read() will have already been called
+ // with an appropriate completion handler.
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
