Author: markt
Date: Wed Nov 28 15:00:06 2018
New Revision: 1847646
URL: http://svn.apache.org/viewvc?rev=1847646&view=rev
Log:
Fix possible cause of intermittent TestCoyoteOutputStream failures.
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=1847646&r1=1847645&r2=1847646&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Wed Nov 28
15:00:06 2018
@@ -1424,7 +1424,9 @@ public class Nio2Endpoint extends Abstra
public boolean hasDataToWrite() {
synchronized (writeCompletionHandler) {
return !socketBufferHandler.isWriteBufferEmpty() ||
- !nonBlockingWriteBuffer.isEmpty() || getError() !=
null;
+ !nonBlockingWriteBuffer.isEmpty() ||
+ writePending.availablePermits() == 0 ||
+ getError() != null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
