This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c0d3d8972bdda6d4080f1c72fa89ca96d3eb6003 Author: Mark Thomas <[email protected]> AuthorDate: Tue Nov 11 15:03:08 2025 +0000 Fix a regression in clustering --- java/org/apache/catalina/tribes/group/RpcChannel.java | 2 +- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/tribes/group/RpcChannel.java b/java/org/apache/catalina/tribes/group/RpcChannel.java index 46297c7c7b..b56a3c233d 100644 --- a/java/org/apache/catalina/tribes/group/RpcChannel.java +++ b/java/org/apache/catalina/tribes/group/RpcChannel.java @@ -101,7 +101,7 @@ public class RpcChannel implements ChannelListener { channel.send(destination, rmsg, sendOptions); if (rpcOptions != NO_REPLY) { long timeoutExpiry = System.nanoTime() + timeout * 1_000_000; - while (collector.isComplete() && timeout > 0) { + while (!collector.isComplete() && timeout > 0) { collector.wait(timeout); timeout = (timeoutExpiry - System.nanoTime()) / 1_000_000; } diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index fb641051d1..30cbe95124 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -270,6 +270,10 @@ <subsection name="Cluster"> <changelog> <!-- Entries for backport and removal before 12.0.0-M1 below this line --> + <fix> + Correct a regression in 11.0.11 that broke some clustering + configurations. (markt) + </fix> </changelog> </subsection> <subsection name="WebSocket"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
