This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 0ed018a991 Fix possible path for UpgradeInfo not to be unregistered
0ed018a991 is described below
commit 0ed018a991938805bf1cf3826cecba07b1ce3606
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Nov 9 14:26:52 2026 +0000
Fix possible path for UpgradeInfo not to be unregistered
Fixes an intermittently failing test
---
java/org/apache/coyote/AbstractProtocol.java | 7 +++++++
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 15 insertions(+)
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index c3793728bc..a55447e2fe 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -1435,6 +1435,13 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
if (processor != null) {
wrapper.setCurrentProcessor(processor);
+ if (wrapper.isClosed()) {
+ /*
+ * The socket was closed while this thread owned the
processor so the close could not release
+ * it.
+ */
+ release(wrapper);
+ }
}
return state;
} catch (SocketException e) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bb0a59e9c3..1c9ecadba9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -108,6 +108,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 11.0.29 (markt)" rtext="in development">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Fix unregistering of UpgradeInfo when a connection is closed. Patch
+ suggested by abernal. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="jdbc-pool">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
