[tomcat] branch 9.0.x updated: Switch to new, non-deprecated method

2020-11-18 Thread 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


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 
AuthorDate: Wed Nov 18 17:10:49 2020 +

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 implements SNICallB
 }
 if (running) {
 running = false;
-acceptor.stop();
+acceptor.stop(10);
 poller.stop();
 for (SocketWrapperBase 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
 }
 if (running) {
 running = false;
-acceptor.stop();
+acceptor.stop(10);
 if (poller != null) {
 poller.destroy();
 poller = null;


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

[tomcat] branch 9.0.x updated: Switch to new, non-deprecated method

2020-11-18 Thread 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


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 
AuthorDate: Wed Nov 18 17:10:49 2020 +

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 implements SNICallB
 }
 if (running) {
 running = false;
-acceptor.stop();
+acceptor.stop(10);
 poller.stop();
 for (SocketWrapperBase 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
 }
 if (running) {
 running = false;
-acceptor.stop();
+acceptor.stop(10);
 if (poller != null) {
 poller.destroy();
 poller = null;


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

[tomcat] branch 9.0.x updated: Switch to new, non-deprecated method

2020-11-18 Thread 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


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 
AuthorDate: Wed Nov 18 17:10:49 2020 +

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 implements SNICallB
 }
 if (running) {
 running = false;
-acceptor.stop();
+acceptor.stop(10);
 poller.stop();
 for (SocketWrapperBase 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
 }
 if (running) {
 running = false;
-acceptor.stop();
+acceptor.stop(10);
 if (poller != null) {
 poller.destroy();
 poller = null;


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

[tomcat] branch 9.0.x updated: Switch to new, non-deprecated method

2020-11-18 Thread 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


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 
AuthorDate: Wed Nov 18 17:10:49 2020 +

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 implements SNICallB
 }
 if (running) {
 running = false;
-acceptor.stop();
+acceptor.stop(10);
 poller.stop();
 for (SocketWrapperBase 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
 }
 if (running) {
 running = false;
-acceptor.stop();
+acceptor.stop(10);
 if (poller != null) {
 poller.destroy();
 poller = null;


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

[tomcat] branch 9.0.x updated: Switch to new, non-deprecated method

2020-11-18 Thread 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


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 
AuthorDate: Wed Nov 18 17:10:49 2020 +

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 implements SNICallB
 }
 if (running) {
 running = false;
-acceptor.stop();
+acceptor.stop(10);
 poller.stop();
 for (SocketWrapperBase 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
 }
 if (running) {
 running = false;
-acceptor.stop();
+acceptor.stop(10);
 if (poller != null) {
 poller.destroy();
 poller = null;


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