Author: remm
Date: Thu Feb 21 20:18:12 2019
New Revision: 1854089
URL: http://svn.apache.org/viewvc?rev=1854089&view=rev
Log:
Revert again after CI fail.
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=1854089&r1=1854088&r2=1854089&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu Feb 21
20:18:12 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;
}
}
@@ -1476,9 +1476,6 @@ public class Nio2Endpoint extends Abstra
@Override
public void registerReadInterest() {
- if (!ContainerThreadMarker.isContainerThread()) {
- return;
- }
synchronized (readCompletionHandler) {
if (readPending.availablePermits() == 0) {
readInterest = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
