[tomcat] 02/02: Refactor to reduce code volume. Thanks to schultz.

[markt]

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

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

commit a56d50974d6cd6af019e09c0f260e76bc0b341b7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 26 07:37:42 2022 +0100

    Refactor to reduce code volume. Thanks to schultz.
---
 java/org/apache/tomcat/util/net/AprEndpoint.java       | 7 -------
 java/org/apache/tomcat/util/net/Nio2Endpoint.java      | 7 -------
 java/org/apache/tomcat/util/net/SocketWrapperBase.java | 7 ++++++-
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 20d10efa11..c02e90fc09 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2813,13 +2813,6 @@ public class AprEndpoint extends 
AbstractEndpoint<Long,Long> implements SNICallB
                 return inline;
             }
 
-            @Override
-            protected boolean hasOutboundRemaining() {
-                // NIO2 never has remaining outbound data when the completion
-                // handler is called
-                return false;
-            }
-
             @Override
             public void run() {
                 // Perform the IO operation
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index c5b9a395f5..49ee411016 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -1021,13 +1021,6 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint<Nio2Channel,AsynchronousS
                 return Nio2Endpoint.isInline();
             }
 
-            @Override
-            protected boolean hasOutboundRemaining() {
-                // NIO2 never has remaining outbound data when the completion
-                // handler is called
-                return false;
-            }
-
             @Override
             protected void start() {
                 if (read) {
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index ecfc0b7aff..cd869fbe3b 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -1036,7 +1036,12 @@ public abstract class SocketWrapperBase<E> {
          */
         protected abstract boolean isInline();
 
-        protected abstract boolean hasOutboundRemaining();
+        protected boolean hasOutboundRemaining() {
+            // NIO2 and APR never have remaining outbound data when the
+            // completion handler is called. NIO needs to override this.
+            return false;
+        }
+
 
         /**
          * Process the operation using the connector executor.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org