[tomcat] branch master updated: getDeferAccept now returns false in AbstractEndpoint

[remm]

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 4c853d3  getDeferAccept now returns false in AbstractEndpoint
4c853d3 is described below

commit 4c853d321df67d43c80f427e9e15016067201dad
Author: remm <r...@apache.org>
AuthorDate: Fri Mar 27 16:46:21 2020 +0100

    getDeferAccept now returns false in AbstractEndpoint
    
    Only APR uses it and it's considered for removal.
---
 java/org/apache/tomcat/util/net/AbstractEndpoint.java |  4 +++-
 java/org/apache/tomcat/util/net/Nio2Endpoint.java     | 13 -------------
 java/org/apache/tomcat/util/net/NioEndpoint.java      | 10 ----------
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 8740af1..ba30767 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -750,7 +750,9 @@ public abstract class AbstractEndpoint<S,U> {
     public boolean getUseAsyncIO() { return useAsyncIO; }
 
 
-    protected abstract boolean getDeferAccept();
+    protected boolean getDeferAccept() {
+        return false;
+    }
 
 
     protected final List<String> negotiableProtocols = new ArrayList<>();
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 2ed8ae4..e54a90e 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -85,19 +85,6 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint<Nio2Channel,AsynchronousS
      */
     private SynchronizedStack<Nio2Channel> nioChannels;
 
-    // ------------------------------------------------------------- Properties
-
-
-    /**
-     * Is deferAccept supported?
-     */
-    @Override
-    public boolean getDeferAccept() {
-        // Not supported
-        return false;
-    }
-
-
     // --------------------------------------------------------- Public Methods
 
 
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index b4da738..5c97023 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -130,16 +130,6 @@ public class NioEndpoint extends 
AbstractJsseEndpoint<NioChannel,SocketChannel>
     private Poller poller = null;
 
 
-    /**
-     * Is deferAccept supported?
-     */
-    @Override
-    public boolean getDeferAccept() {
-        // Not supported
-        return false;
-    }
-
-
     // --------------------------------------------------------- Public Methods
 
     /**


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