This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new e6342dac42 Another concurrency fix for OrderInterceptor
e6342dac42 is described below
commit e6342dac42ee6a409ab78b5fdf9b85747c4cdeac
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jun 16 14:29:41 2026 +0100
Another concurrency fix for OrderInterceptor
---
.../apache/catalina/tribes/group/interceptors/OrderInterceptor.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
b/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
index 1b35a9d3fe..65d07ca698 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
@@ -208,14 +208,16 @@ public class OrderInterceptor extends
ChannelInterceptorBase {
public void memberDisappeared(Member member) {
// clear the remaining queue
inLock.writeLock().lock();
+ outLock.writeLock().lock();
try {
processLeftOvers(member, true);
+ // reset counters
incounter.remove(member);
+ outcounter.remove(member);
} finally {
inLock.writeLock().unlock();
+ outLock.writeLock().unlock();
}
- // reset counters
- outcounter.remove(member);
// notify upwards
super.memberDisappeared(member);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]