This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 085c041 Simply use the superclass rather than a real flush here
085c041 is described below
commit 085c04124f7764053a88441f5afc36c4465e074c
Author: remm <[email protected]>
AuthorDate: Wed Mar 27 12:51:38 2019 +0100
Simply use the superclass rather than a real flush here
---
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 24 +----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 711f777..3397e18 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -744,29 +744,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint<Nio2Channel,AsynchronousS
if (writeNotify) {
return true;
}
-
- if (!writePending.tryAcquire()) {
- writeInterest = true;
- return false;
- }
-
- if (socketBufferHandler.isWriteBufferEmpty() &&
nonBlockingWriteBuffer.isEmpty()) {
- writePending.release();
- return true;
- }
-
- boolean dataLeft = false;
- try {
- dataLeft = flushNonBlocking(true);
- } catch (IOException e) {
- setError(e);
- return true;
- }
- boolean isReady = !dataLeft;
- if (!isReady) {
- writeInterest = true;
- }
- return isReady;
+ return super.isReadyForWrite();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
