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/05/27 17:00:05 UTC
(tomcat) branch 11.0.x updated: Restore non-short-circuit behaviour
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 6e68e4158e Restore non-short-circuit behaviour
6e68e4158e is described below
commit 6e68e4158e9f86ba85c8a883acede0cbd3b2bfda
Author: Mark Thomas <ma...@apache.org>
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 c5142e94a8..d854a1fdb5 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -810,7 +810,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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: (tomcat) branch 11.0.x updated: Restore non-short-circuit behaviour
Posted by Mark Thomas <ma...@apache.org>.
On 27/05/2026 20:42, Christopher Schultz wrote:
> Mark,
>
> On 5/27/26 1:00 PM, markt@apache.org wrote:
>> 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 6e68e4158e Restore non-short-circuit behaviour
>> 6e68e4158e is described below
>>
>> commit 6e68e4158e9f86ba85c8a883acede0cbd3b2bfda
>> Author: Mark Thomas <ma...@apache.org>
>> 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 c5142e94a8..d854a1fdb5 100644
>> --- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
>> +++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
>> @@ -810,7 +810,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"));
>
> If stop() fails, we want to continue and call start(), anyway?
I believe so, yes.
My understanding is that if the number of errors exceeds a threshold,
the recovery thread runs the tried and tested "If it doesn't work, try
turning it off and on again" solution.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: (tomcat) branch 11.0.x updated: Restore non-short-circuit behaviour
Posted by Christopher Schultz <ch...@christopherschultz.net>.
Mark,
On 5/27/26 1:00 PM, markt@apache.org wrote:
> 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 6e68e4158e Restore non-short-circuit behaviour
> 6e68e4158e is described below
>
> commit 6e68e4158e9f86ba85c8a883acede0cbd3b2bfda
> Author: Mark Thomas <ma...@apache.org>
> 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 c5142e94a8..d854a1fdb5 100644
> --- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
> +++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
> @@ -810,7 +810,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"));
If stop() fails, we want to continue and call start(), anyway?
-chris
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org