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 116f46b71d Restore non-short-circuit behaviour
116f46b71d is described below
commit 116f46b71d6731aafbe9bc5c043233a8836ecfc8
Author: Mark Thomas <[email protected]>
AuthorDate: Wed May 27 17:59:40 2026 +0100
Restore non-short-circuit behaviour
---
java/org/apache/catalina/tribes/membership/McastServiceImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
index 6dcac5dab4..efbf34c8e3 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -813,7 +813,8 @@ public class McastServiceImpl extends
MembershipProviderBase {
if (log.isInfoEnabled()) {
log.info(sm.getString("mcastServiceImpl.recovery"));
}
- if (stopService() && startService()) {
+ // Non short-circuit AND since we want both stop and start
to execute
+ if (stopService() & startService()) {
success = true;
if (log.isInfoEnabled()) {
log.info(sm.getString("mcastServiceImpl.recovery.successful"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
