Skip to content

Commit c0d3d89

Browse files
committed
Fix a regression in clustering
1 parent 5179d9c commit c0d3d89

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

java/org/apache/catalina/tribes/group/RpcChannel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public Response[] send(Member[] destination, Serializable message, int rpcOption
101101
channel.send(destination, rmsg, sendOptions);
102102
if (rpcOptions != NO_REPLY) {
103103
long timeoutExpiry = System.nanoTime() + timeout * 1_000_000;
104-
while (collector.isComplete() && timeout > 0) {
104+
while (!collector.isComplete() && timeout > 0) {
105105
collector.wait(timeout);
106106
timeout = (timeoutExpiry - System.nanoTime()) / 1_000_000;
107107
}

webapps/docs/changelog.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,10 @@
270270
<subsection name="Cluster">
271271
<changelog>
272272
<!-- Entries for backport and removal before 12.0.0-M1 below this line -->
273+
<fix>
274+
Correct a regression in 11.0.11 that broke some clustering
275+
configurations. (markt)
276+
</fix>
273277
</changelog>
274278
</subsection>
275279
<subsection name="WebSocket">

0 commit comments

Comments
 (0)