This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 44dc0c13df8fdeb614e67d69e7c292a6e493395d 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 | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/tribes/group/RpcChannel.java b/java/org/apache/catalina/tribes/group/RpcChannel.java index c26cff473c..ab2157afc2 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 a61a9a3e82..cb2fa1d5cf 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -113,6 +113,14 @@ </fix> </changelog> </subsection> + <subsection name="Clustering"> + <changelog> + <fix> + Correct a regression introduced in 10.1.45 that broke some clustering + configurations. (markt) + </fix> + </changelog> + </subsection> </section> <section name="Tomcat 10.1.49 (schultz)" rtext="Release in progress"> <subsection name="Catalina"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
