Author: remm Date: Fri Feb 22 15:37:03 2019 New Revision: 1854141 URL: http://svn.apache.org/viewvc?rev=1854141&view=rev Log: Revert
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1854141&r1=1854140&r2=1854141&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Feb 22 15:37:03 2019 @@ -810,7 +810,7 @@ public class Nio2Endpoint extends Abstra socketBufferHandler.configureReadBufferForRead(); nRead = Math.min(nRead, len); socketBufferHandler.getReadBuffer().get(b, off, nRead); - } else if (nRead == 0 && !block) { + } else if (nRead == 0 && !block && ContainerThreadMarker.isContainerThread()) { readInterest = true; } if (log.isDebugEnabled()) { @@ -873,7 +873,7 @@ public class Nio2Endpoint extends Abstra // data that was just read if (nRead > 0) { nRead = populateReadBuffer(to); - } else if (nRead == 0 && !block) { + } else if (nRead == 0 && !block && ContainerThreadMarker.isContainerThread()) { readInterest = true; } } @@ -1479,7 +1479,7 @@ public class Nio2Endpoint extends Abstra synchronized (readCompletionHandler) { if (readPending.availablePermits() == 0) { readInterest = true; - } else if (readInterest) { + } else { // If no read is pending, start waiting for data awaitBytes(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org