[tomcat] branch master updated: Follow-up to e863f54 for NIO2

[ma...@apache.org]

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

markt 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 f46cf05  Follow-up to e863f54 for NIO2
f46cf05 is described below

commit f46cf05337bae707f567145d757269b75219c81b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 19 17:02:03 2020 +0000

    Follow-up to e863f54 for NIO2
---
 java/org/apache/tomcat/util/net/Nio2Endpoint.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 5741498..957a55c 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -407,8 +407,13 @@ public class Nio2Endpoint extends AbstractJsseEndpoint<Nio2Channel,AsynchronousS
             }
         }
 
-        @Override
-        public void stop() {
+        /**
+         * Signals the Acceptor to stop.
+         *
+         * @param waitSeconds Ignored for NIO2.
+         *
+         */
+        public void stop(int waitSeconds) {
             acceptor.state = AcceptorState.ENDED;
         }
 


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