This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 425174b7ed Follow-up to "Make hasMembers volatile ..."
425174b7ed is described below
commit 425174b7ed34e348e0c603bea33812e12911fefc
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Oct 2 16:00:35 2026 +0100
Follow-up to "Make hasMembers volatile ..."
Remove it to avoid issues with stale values that remained.
---
java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
index a9666a4925..1a297ef34a 100644
--- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
+++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
@@ -374,17 +374,12 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
}
}
- /**
- * has members
- */
- protected volatile boolean hasMembers = false;
-
/**
* {@inheritDoc}
*/
@Override
public boolean hasMembers() {
- return hasMembers;
+ return channel.hasMembers();
}
/**
@@ -810,7 +805,6 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
@Override
public void memberAdded(Member member) {
try {
- hasMembers = channel.hasMembers();
if (log.isInfoEnabled()) {
log.info(sm.getString("simpleTcpCluster.member.added",
member));
}
@@ -833,7 +827,6 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
@Override
public void memberDisappeared(Member member) {
try {
- hasMembers = channel.hasMembers();
if (log.isInfoEnabled()) {
log.info(sm.getString("simpleTcpCluster.member.disappeared",
member));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
