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 5301ba6 Don't force socket close if bind is on init rather than start
5301ba6 is described below
commit 5301ba6b834f5bfb2062941c95418f54da347cee
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Aug 13 19:30:32 2020 +0100
Don't force socket close if bind is on init rather than start
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 57e6d5f..004f7a7 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -491,7 +491,7 @@ public class AprEndpoint extends
AbstractEndpoint<Long,Long> implements SNICallB
for (SocketWrapperBase<Long> socketWrapper : connections.values())
{
socketWrapper.close();
}
- if (acceptor.getState() != AcceptorState.ENDED) {
+ if (acceptor.getState() != AcceptorState.ENDED &&
!getBindOnInit()) {
log.warn(sm.getString("endpoint.warn.unlockAcceptorFailed",
acceptor.getThreadName()));
// If the Acceptor is still running force
// the hard socket close.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
