You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2026/10/02 15:02:25 UTC

(tomcat) branch 11.0.x updated: Follow-up to "Make hasMembers volatile ..."

This is an automated email from the ASF dual-hosted git repository.

markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/11.0.x by this push:
     new 58ae786a9c Follow-up to "Make hasMembers volatile ..."
58ae786a9c is described below

commit 58ae786a9cbefe20f4f26a36cf4cbbd54254c0aa
Author: Mark Thomas <ma...@apache.org>
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 5b709b91fc..b5fddc98ac 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();
     }
 
     /**
@@ -808,7 +803,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));
             }
@@ -831,7 +825,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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org