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
commit 004a12044557eee0282b715bd30705c494ae1bc4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 20 10:27:01 2019 +0100
Revert "Fix test failures caused by APR crash during shutdown"
This reverts commit 9825246d0ce833552a3745ac3b02a44551789caa.
---
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 6dde69c..46c7047 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1126,11 +1126,8 @@ public class AprEndpoint extends
AbstractEndpoint<Long,Long> implements SNICallB
// 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
