You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/11/18 17:20:54 UTC
[tomcat] branch 9.0.x updated: Switch to new, non-deprecated method
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 84cf4c3 Switch to new, non-deprecated method
84cf4c3 is described below
commit 84cf4c3d8041d5c39a8f99b6de09cad9fa24a470
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 18 17:10:49 2020 +0000
Switch to new, non-deprecated method
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +-
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 2 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 67ef3d1..4ba3420 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -486,7 +486,7 @@ public class AprEndpoint extends AbstractEndpoint<Long,Long> implements SNICallB
}
if (running) {
running = false;
- acceptor.stop();
+ acceptor.stop(10);
poller.stop();
for (SocketWrapperBase<Long> socketWrapper : connections.values()) {
socketWrapper.close();
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 15873ec..18ead41 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -204,7 +204,7 @@ public class Nio2Endpoint extends AbstractJsseEndpoint<Nio2Channel,AsynchronousS
}
if (running) {
running = false;
- acceptor.stop();
+ acceptor.stop(10);
// Use the executor to avoid binding the main thread if something bad
// occurs and unbind will also wait for a bit for it to complete
getExecutor().execute(new Runnable() {
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 97e9f6d..1b50835 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -292,7 +292,7 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
}
if (running) {
running = false;
- acceptor.stop();
+ acceptor.stop(10);
if (poller != null) {
poller.destroy();
poller = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org