This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6dae407a9a77bae99cc5bb6a11b200252f45b20c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 23 21:34:48 2019 +0100
Revert "Fix test failures caused by APR crash during shutdown"
This reverts commit 07f3c37377459615a53293ca52be43de7a44970d.
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 3d1d891..4c1ca49 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1248,11 +1248,8 @@ public class AprEndpoint extends AbstractEndpoint<Long>
implements SNICallBack {
// Close all sockets in the add queue
info = addList.get();
while (info != null) {
- // Make sure the socket isn't in the poller before we close it
+ // Make sure the socket isn't in the poller before we close it
removeFromPoller(info.socket);
- // Close the SocketWrapper to prevent any still running
application
- // threads from trying to use the socket
- connections.get(Long.valueOf(info.socket)).close();
// Poller isn't running at this point so use destroySocket()
// directly
destroySocket(info.socket);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
