[tomcat] branch 8.5.x updated: Simply use the superclass rather than a real flush here

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 4e5344e  Simply use the superclass rather than a real flush here
4e5344e is described below

commit 4e5344eb1acc71219d16d87c88f32d38985f5630
Author: remm <r...@apache.org>
AuthorDate: Wed Mar 27 13:37:51 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 9182aec..27891d5 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -731,29 +731,7 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint<Nio2Channel> {
                 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org