date:20240510

Re: [VOTE] Release Apache Tomcat 10.1.24

2024-05-10 Thread Christopher Schultz


Mark,

On 5/10/24 06:26, Mark Thomas wrote:

On 10/05/2024 11:22, Romain Manni-Bucau wrote:

Hi Christopher,

Is it possible to close the staging repo please (I get a 404)?


There is a typo in the VOTE email. The correct staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1495


Thanks for replying about this. Apologies for the typo :/

-chris


Le ven. 10 mai 2024 à 10:00, Mark Thomas  a écrit :


On 09/05/2024 19:12, Christopher Schultz wrote:


The proposed 10.1.24 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 10.1.24


Tests pass on Linux, Windows, MacOS (Intel) and MacOS (M1).

Build is cross platform reproducible (Linux / Windows).

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org






-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch 9.0.x updated: Code clean-up - formatting. No functional change

2024-05-10 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new f75800761f Code clean-up - formatting. No functional change
f75800761f is described below

commit f75800761f433befcf2224b45624cc4406a839fc
Author: Mark Thomas 
AuthorDate: Fri May 10 14:59:26 2024 +0100

Code clean-up - formatting. No functional change
---
 .../catalina/tribes/transport/AbstractRxTask.java  |   3 +-
 .../catalina/tribes/transport/AbstractSender.java  |  15 +-
 .../catalina/tribes/transport/Constants.java   |   8 +-
 .../catalina/tribes/transport/DataSender.java  |   7 +
 .../tribes/transport/MultiPointSender.java |   9 +-
 .../catalina/tribes/transport/PooledSender.java|  51 ++---
 .../catalina/tribes/transport/ReceiverBase.java|  66 ---
 .../tribes/transport/ReplicationTransmitter.java   |  11 +-
 .../catalina/tribes/transport/RxTaskPool.java  |  48 ++---
 .../catalina/tribes/transport/SenderState.java |   6 +-
 .../catalina/tribes/transport/bio/BioReceiver.java |  45 +++--
 .../tribes/transport/bio/BioReplicationTask.java   |  78 
 .../catalina/tribes/transport/bio/BioSender.java   | 168 
 .../tribes/transport/bio/MultipointBioSender.java  |  52 ++---
 .../tribes/transport/bio/PooledMultiSender.java|  15 +-
 .../catalina/tribes/transport/nio/NioReceiver.java | 196 +--
 .../tribes/transport/nio/NioReplicationTask.java   | 212 ++---
 .../catalina/tribes/transport/nio/NioSender.java   | 195 +--
 .../tribes/transport/nio/ParallelNioSender.java| 150 ---
 .../tribes/transport/nio/PooledParallelSender.java |  16 +-
 20 files changed, 690 insertions(+), 661 deletions(-)

diff --git a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java 
b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
index 15844d9b7f..aa2d9a1b33 100644
--- a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
+++ b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
@@ -18,8 +18,7 @@ package org.apache.catalina.tribes.transport;
 
 import org.apache.catalina.tribes.io.ListenCallback;
 
-public abstract class AbstractRxTask implements Runnable
-{
+public abstract class AbstractRxTask implements Runnable {
 
 public static final int OPTION_DIRECT_BUFFER = 
ReceiverBase.OPTION_DIRECT_BUFFER;
 
diff --git a/java/org/apache/catalina/tribes/transport/AbstractSender.java 
b/java/org/apache/catalina/tribes/transport/AbstractSender.java
index ba17303123..f3b7a0a563 100644
--- a/java/org/apache/catalina/tribes/transport/AbstractSender.java
+++ b/java/org/apache/catalina/tribes/transport/AbstractSender.java
@@ -37,7 +37,7 @@ public abstract class AbstractSender implements DataSender {
 private Member destination;
 private InetAddress address;
 private int port;
-private int maxRetryAttempts = 1;//1 resends
+private int maxRetryAttempts = 1;// 1 resends
 private int attempt;
 private boolean tcpNoDelay = true;
 private boolean soKeepAlive = false;
@@ -52,8 +52,9 @@ public abstract class AbstractSender implements DataSender {
 
 /**
  * transfers sender properties from one sender to another
+ *
  * @param from AbstractSender
- * @param to AbstractSender
+ * @param to   AbstractSender
  */
 public static void transferProperties(AbstractSender from, AbstractSender 
to) {
 to.rxBufSize = from.rxBufSize;
@@ -87,19 +88,19 @@ public abstract class AbstractSender implements DataSender {
 public boolean keepalive() {
 boolean disconnect = false;
 if (isUdpBased()) {
-disconnect = true; //always disconnect UDP, TODO optimize the 
keepalive handling
-} else if ( keepAliveCount >= 0 && requestCount>keepAliveCount ) {
+disconnect = true; // always disconnect UDP, TODO optimize the 
keepalive handling
+} else if (keepAliveCount >= 0 && requestCount > keepAliveCount) {
 disconnect = true;
-} else if ( keepAliveTime >= 0 && 
(System.currentTimeMillis()-connectTime)>keepAliveTime ) {
+} else if (keepAliveTime >= 0 && (System.currentTimeMillis() - 
connectTime) > keepAliveTime) {
 disconnect = true;
 }
-if ( disconnect ) {
+if (disconnect) {
 disconnect();
 }
 return disconnect;
 }
 
-protected void setConnected(boolean connected){
+protected void setConnected(boolean connected) {
 this.connected = connected;
 }
 
diff --git a/java/org/apache/catalina/tribes/transport/Constants.java 
b/java/org/apache/catalina/tribes/transport/Constants.java
index 07946d826e..46983a493d 100644
--- a/java/org/apache/catalina/tribes/transport/Constants.java
+++ b/java/org/apache/catalina/tribes/transport/Constant

(tomcat) branch 10.1.x updated: Code clean-up - formatting. No functional change

2024-05-10 Thread markt

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

markt 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 fa0e97e9fd Code clean-up - formatting. No functional change
fa0e97e9fd is described below

commit fa0e97e9fdc62fd90320869e9fa51c40dead3d0c
Author: Mark Thomas 
AuthorDate: Fri May 10 14:59:18 2024 +0100

Code clean-up - formatting. No functional change
---
 .../catalina/tribes/transport/AbstractRxTask.java  |   3 +-
 .../catalina/tribes/transport/AbstractSender.java  |  15 +-
 .../catalina/tribes/transport/Constants.java   |   8 +-
 .../catalina/tribes/transport/DataSender.java  |   7 +
 .../tribes/transport/MultiPointSender.java |   9 +-
 .../catalina/tribes/transport/PooledSender.java|  51 ++---
 .../catalina/tribes/transport/ReceiverBase.java|  66 ---
 .../tribes/transport/ReplicationTransmitter.java   |  11 +-
 .../catalina/tribes/transport/RxTaskPool.java  |  48 ++---
 .../catalina/tribes/transport/SenderState.java |   6 +-
 .../catalina/tribes/transport/nio/NioReceiver.java | 196 +--
 .../tribes/transport/nio/NioReplicationTask.java   | 212 ++---
 .../catalina/tribes/transport/nio/NioSender.java   | 195 +--
 .../tribes/transport/nio/ParallelNioSender.java| 141 +++---
 .../tribes/transport/nio/PooledParallelSender.java |  16 +-
 15 files changed, 502 insertions(+), 482 deletions(-)

diff --git a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java 
b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
index 2a95f7dd53..2d17ae166b 100644
--- a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
+++ b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
@@ -18,8 +18,7 @@ package org.apache.catalina.tribes.transport;
 
 import org.apache.catalina.tribes.io.ListenCallback;
 
-public abstract class AbstractRxTask implements Runnable
-{
+public abstract class AbstractRxTask implements Runnable {
 
 public static final int OPTION_DIRECT_BUFFER = 
ReceiverBase.OPTION_DIRECT_BUFFER;
 
diff --git a/java/org/apache/catalina/tribes/transport/AbstractSender.java 
b/java/org/apache/catalina/tribes/transport/AbstractSender.java
index ba17303123..f3b7a0a563 100644
--- a/java/org/apache/catalina/tribes/transport/AbstractSender.java
+++ b/java/org/apache/catalina/tribes/transport/AbstractSender.java
@@ -37,7 +37,7 @@ public abstract class AbstractSender implements DataSender {
 private Member destination;
 private InetAddress address;
 private int port;
-private int maxRetryAttempts = 1;//1 resends
+private int maxRetryAttempts = 1;// 1 resends
 private int attempt;
 private boolean tcpNoDelay = true;
 private boolean soKeepAlive = false;
@@ -52,8 +52,9 @@ public abstract class AbstractSender implements DataSender {
 
 /**
  * transfers sender properties from one sender to another
+ *
  * @param from AbstractSender
- * @param to AbstractSender
+ * @param to   AbstractSender
  */
 public static void transferProperties(AbstractSender from, AbstractSender 
to) {
 to.rxBufSize = from.rxBufSize;
@@ -87,19 +88,19 @@ public abstract class AbstractSender implements DataSender {
 public boolean keepalive() {
 boolean disconnect = false;
 if (isUdpBased()) {
-disconnect = true; //always disconnect UDP, TODO optimize the 
keepalive handling
-} else if ( keepAliveCount >= 0 && requestCount>keepAliveCount ) {
+disconnect = true; // always disconnect UDP, TODO optimize the 
keepalive handling
+} else if (keepAliveCount >= 0 && requestCount > keepAliveCount) {
 disconnect = true;
-} else if ( keepAliveTime >= 0 && 
(System.currentTimeMillis()-connectTime)>keepAliveTime ) {
+} else if (keepAliveTime >= 0 && (System.currentTimeMillis() - 
connectTime) > keepAliveTime) {
 disconnect = true;
 }
-if ( disconnect ) {
+if (disconnect) {
 disconnect();
 }
 return disconnect;
 }
 
-protected void setConnected(boolean connected){
+protected void setConnected(boolean connected) {
 this.connected = connected;
 }
 
diff --git a/java/org/apache/catalina/tribes/transport/Constants.java 
b/java/org/apache/catalina/tribes/transport/Constants.java
index 07946d826e..46983a493d 100644
--- a/java/org/apache/catalina/tribes/transport/Constants.java
+++ b/java/org/apache/catalina/tribes/transport/Constants.java
@@ -19,8 +19,8 @@ package org.apache.catalina.tribes.transport;
 import org.apache.catalina.tribes.io.XByteBuffer;
 
 /**
- * Manifest constants for the org.apache.catalina.tribes.transport
- * package.
+ * Manifest constants for the 
org.apache.catalina.tribes.transport package.
+ *
  * @author Peter Rossbach
  */
 publi

(tomcat) branch main updated: Code clean-up - formatting. No functional change

2024-05-10 Thread markt

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

markt 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 6a166ad281 Code clean-up - formatting. No functional change
6a166ad281 is described below

commit 6a166ad2812b775532b99d6c288ad856e5642c5c
Author: Mark Thomas 
AuthorDate: Fri May 10 14:56:09 2024 +0100

Code clean-up - formatting. No functional change
---
 .../catalina/tribes/transport/AbstractRxTask.java  |   3 +-
 .../catalina/tribes/transport/AbstractSender.java  |  15 +-
 .../catalina/tribes/transport/Constants.java   |   8 +-
 .../catalina/tribes/transport/DataSender.java  |   7 +
 .../tribes/transport/MultiPointSender.java |   9 +-
 .../catalina/tribes/transport/PooledSender.java|  51 ++---
 .../catalina/tribes/transport/ReceiverBase.java|  66 ---
 .../tribes/transport/ReplicationTransmitter.java   |  11 +-
 .../catalina/tribes/transport/RxTaskPool.java  |  48 ++---
 .../catalina/tribes/transport/SenderState.java |   6 +-
 .../catalina/tribes/transport/nio/NioReceiver.java | 196 +--
 .../tribes/transport/nio/NioReplicationTask.java   | 212 ++---
 .../catalina/tribes/transport/nio/NioSender.java   | 195 +--
 .../tribes/transport/nio/ParallelNioSender.java| 141 +++---
 .../tribes/transport/nio/PooledParallelSender.java |  16 +-
 15 files changed, 502 insertions(+), 482 deletions(-)

diff --git a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java 
b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
index 2a95f7dd53..2d17ae166b 100644
--- a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
+++ b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
@@ -18,8 +18,7 @@ package org.apache.catalina.tribes.transport;
 
 import org.apache.catalina.tribes.io.ListenCallback;
 
-public abstract class AbstractRxTask implements Runnable
-{
+public abstract class AbstractRxTask implements Runnable {
 
 public static final int OPTION_DIRECT_BUFFER = 
ReceiverBase.OPTION_DIRECT_BUFFER;
 
diff --git a/java/org/apache/catalina/tribes/transport/AbstractSender.java 
b/java/org/apache/catalina/tribes/transport/AbstractSender.java
index ba17303123..f3b7a0a563 100644
--- a/java/org/apache/catalina/tribes/transport/AbstractSender.java
+++ b/java/org/apache/catalina/tribes/transport/AbstractSender.java
@@ -37,7 +37,7 @@ public abstract class AbstractSender implements DataSender {
 private Member destination;
 private InetAddress address;
 private int port;
-private int maxRetryAttempts = 1;//1 resends
+private int maxRetryAttempts = 1;// 1 resends
 private int attempt;
 private boolean tcpNoDelay = true;
 private boolean soKeepAlive = false;
@@ -52,8 +52,9 @@ public abstract class AbstractSender implements DataSender {
 
 /**
  * transfers sender properties from one sender to another
+ *
  * @param from AbstractSender
- * @param to AbstractSender
+ * @param to   AbstractSender
  */
 public static void transferProperties(AbstractSender from, AbstractSender 
to) {
 to.rxBufSize = from.rxBufSize;
@@ -87,19 +88,19 @@ public abstract class AbstractSender implements DataSender {
 public boolean keepalive() {
 boolean disconnect = false;
 if (isUdpBased()) {
-disconnect = true; //always disconnect UDP, TODO optimize the 
keepalive handling
-} else if ( keepAliveCount >= 0 && requestCount>keepAliveCount ) {
+disconnect = true; // always disconnect UDP, TODO optimize the 
keepalive handling
+} else if (keepAliveCount >= 0 && requestCount > keepAliveCount) {
 disconnect = true;
-} else if ( keepAliveTime >= 0 && 
(System.currentTimeMillis()-connectTime)>keepAliveTime ) {
+} else if (keepAliveTime >= 0 && (System.currentTimeMillis() - 
connectTime) > keepAliveTime) {
 disconnect = true;
 }
-if ( disconnect ) {
+if (disconnect) {
 disconnect();
 }
 return disconnect;
 }
 
-protected void setConnected(boolean connected){
+protected void setConnected(boolean connected) {
 this.connected = connected;
 }
 
diff --git a/java/org/apache/catalina/tribes/transport/Constants.java 
b/java/org/apache/catalina/tribes/transport/Constants.java
index 07946d826e..46983a493d 100644
--- a/java/org/apache/catalina/tribes/transport/Constants.java
+++ b/java/org/apache/catalina/tribes/transport/Constants.java
@@ -19,8 +19,8 @@ package org.apache.catalina.tribes.transport;
 import org.apache.catalina.tribes.io.XByteBuffer;
 
 /**
- * Manifest constants for the org.apache.catalina.tribes.transport
- * package.
+ * Manifest constants for the 
org.apache.catalina.tribes.transport package.
+ *
  * @author Peter Rossbach
  */
 public cl

(tomcat) branch 9.0.x updated: Align with 10.1.x and 11.0.x

2024-05-10 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 56d0970f6a Align with 10.1.x and 11.0.x
56d0970f6a is described below

commit 56d0970f6aaf51940d70962e27a01c5ed4738407
Author: Mark Thomas 
AuthorDate: Fri May 10 14:50:11 2024 +0100

Align with 10.1.x and 11.0.x
---
 .../membership/cloud/DNSMembershipProvider.java| 25 +++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git 
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java 
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
index c141d78529..eb715aa4fb 100644
--- 
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
+++ 
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
@@ -58,6 +58,7 @@ import org.apache.juli.logging.LogFactory;
  *  }
  *  
  *
+ * minimal example for the Service my-tomcat-app-membership, note the 
selector
  * {@code dns-membership-service.yml }
  *
  * 
@@ -71,14 +72,32 @@ import org.apache.juli.logging.LogFactory;
  *   name: my-tomcat-app-membership
  * spec:
  *   clusterIP: None
- *   ports:
- *   - name: membership
- * port: 
  *   selector:
  * app: my-tomcat-app
  * }
  * 
  *
+ * First Tomcat pod minimal example, note the labels that 
must correspond to the
+ * selector in the service.
+ * {@code tomcat1.yml }
+ *
+ * 
+ * {@code
+ * apiVersion: v1
+ * kind: Pod
+ * metadata:
+ *   name: tomcat1
+ *   labels:
+ * app: my-tomcat-app
+ * spec:
+ *   containers:
+ *   - name: tomcat
+ * image: tomcat
+ * ports:
+ * - containerPort: 8080
+ * }
+ * 
+ *
  * Environment variable configuration
  * {@code DNS_MEMBERSHIP_SERVICE_NAME=my-tomcat-app-membership }
  */


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch 10.1.x updated: Align with 11.0.x

2024-05-10 Thread markt

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

markt 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 deeaf9eb94 Align with 11.0.x
deeaf9eb94 is described below

commit deeaf9eb9486ecf29d2af2948a8558ae0332c636
Author: Mark Thomas 
AuthorDate: Fri May 10 14:49:56 2024 +0100

Align with 11.0.x
---
 .../membership/cloud/DNSMembershipProvider.java| 25 +++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git 
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java 
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
index c141d78529..eb715aa4fb 100644
--- 
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
+++ 
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
@@ -58,6 +58,7 @@ import org.apache.juli.logging.LogFactory;
  *  }
  *  
  *
+ * minimal example for the Service my-tomcat-app-membership, note the 
selector
  * {@code dns-membership-service.yml }
  *
  * 
@@ -71,14 +72,32 @@ import org.apache.juli.logging.LogFactory;
  *   name: my-tomcat-app-membership
  * spec:
  *   clusterIP: None
- *   ports:
- *   - name: membership
- * port: 
  *   selector:
  * app: my-tomcat-app
  * }
  * 
  *
+ * First Tomcat pod minimal example, note the labels that 
must correspond to the
+ * selector in the service.
+ * {@code tomcat1.yml }
+ *
+ * 
+ * {@code
+ * apiVersion: v1
+ * kind: Pod
+ * metadata:
+ *   name: tomcat1
+ *   labels:
+ * app: my-tomcat-app
+ * spec:
+ *   containers:
+ *   - name: tomcat
+ * image: tomcat
+ * ports:
+ * - containerPort: 8080
+ * }
+ * 
+ *
  * Environment variable configuration
  * {@code DNS_MEMBERSHIP_SERVICE_NAME=my-tomcat-app-membership }
  */


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch 9.0.x updated: Code clean-up - no functional change

2024-05-10 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 00dd70a758 Code clean-up - no functional change
00dd70a758 is described below

commit 00dd70a758f976d0758219486a62d5cd0b803b69
Author: Mark Thomas 
AuthorDate: Fri May 10 14:48:07 2024 +0100

Code clean-up - no functional change
---
 .../catalina/tribes/membership/Constants.java  |   4 +-
 .../catalina/tribes/membership/McastService.java   | 206 +++--
 .../tribes/membership/McastServiceImpl.java| 246 +++
 .../catalina/tribes/membership/MemberImpl.java | 334 ++---
 .../catalina/tribes/membership/Membership.java |  52 ++--
 .../tribes/membership/MembershipProviderBase.java  |   2 +-
 .../tribes/membership/MembershipServiceBase.java   |  14 +-
 .../catalina/tribes/membership/StaticMember.java   |  24 +-
 .../membership/StaticMembershipProvider.java   |  56 ++--
 .../tribes/membership/StaticMembershipService.java |  28 +-
 .../membership/cloud/AbstractStreamProvider.java   |  54 ++--
 .../cloud/CertificateStreamProvider.java   |  15 +-
 .../membership/cloud/CloudMembershipProvider.java  |  17 +-
 .../membership/cloud/CloudMembershipService.java   |  36 ++-
 .../membership/cloud/DNSMembershipProvider.java|   9 +-
 .../cloud/KubernetesMembershipProvider.java|  30 +-
 .../tribes/membership/cloud/StreamProvider.java|  12 +-
 .../membership/cloud/TokenStreamProvider.java  |   2 +-
 18 files changed, 580 insertions(+), 561 deletions(-)

diff --git a/java/org/apache/catalina/tribes/membership/Constants.java 
b/java/org/apache/catalina/tribes/membership/Constants.java
index b0a9dda156..dd5a2f5866 100644
--- a/java/org/apache/catalina/tribes/membership/Constants.java
+++ b/java/org/apache/catalina/tribes/membership/Constants.java
@@ -19,14 +19,14 @@ package org.apache.catalina.tribes.membership;
 import org.apache.catalina.tribes.util.Arrays;
 
 /**
- * Manifest constants for the 
org.apache.catalina.tribes.membership
- * package.
+ * Manifest constants for the 
org.apache.catalina.tribes.membership package.
  *
  * @author Peter Rossbach
  */
 public class Constants {
 
 public static final String Package = 
"org.apache.catalina.tribes.membership";
+
 public static void main(String[] args) throws Exception {
 System.out.println(Arrays.toString("TRIBES-B".getBytes()));
 System.out.println(Arrays.toString("TRIBES-E".getBytes()));
diff --git a/java/org/apache/catalina/tribes/membership/McastService.java 
b/java/org/apache/catalina/tribes/membership/McastService.java
index 4c2c11917c..4768455281 100644
--- a/java/org/apache/catalina/tribes/membership/McastService.java
+++ b/java/org/apache/catalina/tribes/membership/McastService.java
@@ -38,13 +38,11 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
 /**
- * A membership implementation using simple multicast.
- * This is the representation of a multicast membership service.
- * This class is responsible for maintaining a list of active cluster nodes in 
the cluster.
- * If a node fails to send out a heartbeat, the node will be dismissed.
+ * A membership implementation using simple multicast. This is the 
representation of a multicast membership
+ * service. This class is responsible for maintaining a list of active cluster 
nodes in the cluster. If a node fails to
+ * send out a heartbeat, the node will be dismissed.
  */
-public class McastService
-extends MembershipServiceBase implements MessageListener, 
McastServiceMBean {
+public class McastService extends MembershipServiceBase implements 
MessageListener, McastServiceMBean {
 
 private static final Log log = LogFactory.getLog(McastService.class);
 
@@ -65,7 +63,7 @@ public class McastService
 /**
  * The local member
  */
-protected MemberImpl localMember ;
+protected MemberImpl localMember;
 private int mcastSoTimeout;
 private int mcastTTL;
 
@@ -82,31 +80,33 @@ public class McastService
  * Create a membership service.
  */
 public McastService() {
-//default values
+// default values
 setDefaults(this.properties);
 }
 
 /**
  * Sets the properties for the membership service.
- * @param properties
- * All are required
- * 1. mcastPort - the port to listen to
- * 2. mcastAddress - the mcast group address
- * 4. bindAddress - the bind address if any - only one that can be null
- * 5. memberDropTime - the time a member is gone before it is considered 
gone.
- * 6. mcastFrequency - the frequency of sending messages
- * 7. tcpListenPort - the port this member listens to
- * 8. tcpListenHost - the bind address of this member
+ *
+ * @param properties 
+ *   All are required

(tomcat) branch 10.1.x updated: Code clean-up - no functional change

2024-05-10 Thread markt

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

markt 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 ea1d6fe231 Code clean-up - no functional change
ea1d6fe231 is described below

commit ea1d6fe2317332c3200bc8aa895bd8cc0a9c82a4
Author: Mark Thomas 
AuthorDate: Fri May 10 14:48:01 2024 +0100

Code clean-up - no functional change
---
 .../catalina/tribes/membership/Constants.java  |   4 +-
 .../catalina/tribes/membership/McastService.java   | 206 +++--
 .../tribes/membership/McastServiceImpl.java| 246 
 .../catalina/tribes/membership/MemberImpl.java | 322 ++---
 .../catalina/tribes/membership/Membership.java |  52 ++--
 .../tribes/membership/MembershipProviderBase.java  |   2 +-
 .../tribes/membership/MembershipServiceBase.java   |  14 +-
 .../catalina/tribes/membership/StaticMember.java   |  24 +-
 .../membership/StaticMembershipProvider.java   |  56 ++--
 .../tribes/membership/StaticMembershipService.java |  28 +-
 .../membership/cloud/AbstractStreamProvider.java   |  54 ++--
 .../cloud/CertificateStreamProvider.java   |  15 +-
 .../membership/cloud/CloudMembershipProvider.java  |  17 +-
 .../membership/cloud/CloudMembershipService.java   |  36 ++-
 .../membership/cloud/DNSMembershipProvider.java|   9 +-
 .../cloud/KubernetesMembershipProvider.java|  30 +-
 .../tribes/membership/cloud/StreamProvider.java|  12 +-
 .../membership/cloud/TokenStreamProvider.java  |   2 +-
 18 files changed, 574 insertions(+), 555 deletions(-)

diff --git a/java/org/apache/catalina/tribes/membership/Constants.java 
b/java/org/apache/catalina/tribes/membership/Constants.java
index b0a9dda156..dd5a2f5866 100644
--- a/java/org/apache/catalina/tribes/membership/Constants.java
+++ b/java/org/apache/catalina/tribes/membership/Constants.java
@@ -19,14 +19,14 @@ package org.apache.catalina.tribes.membership;
 import org.apache.catalina.tribes.util.Arrays;
 
 /**
- * Manifest constants for the 
org.apache.catalina.tribes.membership
- * package.
+ * Manifest constants for the 
org.apache.catalina.tribes.membership package.
  *
  * @author Peter Rossbach
  */
 public class Constants {
 
 public static final String Package = 
"org.apache.catalina.tribes.membership";
+
 public static void main(String[] args) throws Exception {
 System.out.println(Arrays.toString("TRIBES-B".getBytes()));
 System.out.println(Arrays.toString("TRIBES-E".getBytes()));
diff --git a/java/org/apache/catalina/tribes/membership/McastService.java 
b/java/org/apache/catalina/tribes/membership/McastService.java
index 4c2c11917c..4768455281 100644
--- a/java/org/apache/catalina/tribes/membership/McastService.java
+++ b/java/org/apache/catalina/tribes/membership/McastService.java
@@ -38,13 +38,11 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
 /**
- * A membership implementation using simple multicast.
- * This is the representation of a multicast membership service.
- * This class is responsible for maintaining a list of active cluster nodes in 
the cluster.
- * If a node fails to send out a heartbeat, the node will be dismissed.
+ * A membership implementation using simple multicast. This is the 
representation of a multicast membership
+ * service. This class is responsible for maintaining a list of active cluster 
nodes in the cluster. If a node fails to
+ * send out a heartbeat, the node will be dismissed.
  */
-public class McastService
-extends MembershipServiceBase implements MessageListener, 
McastServiceMBean {
+public class McastService extends MembershipServiceBase implements 
MessageListener, McastServiceMBean {
 
 private static final Log log = LogFactory.getLog(McastService.class);
 
@@ -65,7 +63,7 @@ public class McastService
 /**
  * The local member
  */
-protected MemberImpl localMember ;
+protected MemberImpl localMember;
 private int mcastSoTimeout;
 private int mcastTTL;
 
@@ -82,31 +80,33 @@ public class McastService
  * Create a membership service.
  */
 public McastService() {
-//default values
+// default values
 setDefaults(this.properties);
 }
 
 /**
  * Sets the properties for the membership service.
- * @param properties
- * All are required
- * 1. mcastPort - the port to listen to
- * 2. mcastAddress - the mcast group address
- * 4. bindAddress - the bind address if any - only one that can be null
- * 5. memberDropTime - the time a member is gone before it is considered 
gone.
- * 6. mcastFrequency - the frequency of sending messages
- * 7. tcpListenPort - the port this member listens to
- * 8. tcpListenHost - the bind address of this member
+ *
+ * @param properties 
+ *   All are requi

(tomcat) branch main updated: Code clean-up - no functional change

2024-05-10 Thread markt

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

markt 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 7668f14fc0 Code clean-up - no functional change
7668f14fc0 is described below

commit 7668f14fc0ecc080b6031dd898ffbf55177c8281
Author: Mark Thomas 
AuthorDate: Fri May 10 14:45:33 2024 +0100

Code clean-up - no functional change
---
 .../catalina/tribes/membership/Constants.java  |   4 +-
 .../catalina/tribes/membership/McastService.java   | 206 +++--
 .../tribes/membership/McastServiceImpl.java| 246 
 .../catalina/tribes/membership/MemberImpl.java | 322 ++---
 .../catalina/tribes/membership/Membership.java |  52 ++--
 .../tribes/membership/MembershipProviderBase.java  |   2 +-
 .../tribes/membership/MembershipServiceBase.java   |  14 +-
 .../catalina/tribes/membership/StaticMember.java   |  24 +-
 .../membership/StaticMembershipProvider.java   |  56 ++--
 .../tribes/membership/StaticMembershipService.java |  28 +-
 .../membership/cloud/AbstractStreamProvider.java   |  54 ++--
 .../cloud/CertificateStreamProvider.java   |  15 +-
 .../membership/cloud/CloudMembershipProvider.java  |  17 +-
 .../membership/cloud/CloudMembershipService.java   |  36 ++-
 .../membership/cloud/DNSMembershipProvider.java|  14 +-
 .../cloud/KubernetesMembershipProvider.java|  30 +-
 .../tribes/membership/cloud/StreamProvider.java|  12 +-
 .../membership/cloud/TokenStreamProvider.java  |   2 +-
 18 files changed, 576 insertions(+), 558 deletions(-)

diff --git a/java/org/apache/catalina/tribes/membership/Constants.java 
b/java/org/apache/catalina/tribes/membership/Constants.java
index b0a9dda156..dd5a2f5866 100644
--- a/java/org/apache/catalina/tribes/membership/Constants.java
+++ b/java/org/apache/catalina/tribes/membership/Constants.java
@@ -19,14 +19,14 @@ package org.apache.catalina.tribes.membership;
 import org.apache.catalina.tribes.util.Arrays;
 
 /**
- * Manifest constants for the 
org.apache.catalina.tribes.membership
- * package.
+ * Manifest constants for the 
org.apache.catalina.tribes.membership package.
  *
  * @author Peter Rossbach
  */
 public class Constants {
 
 public static final String Package = 
"org.apache.catalina.tribes.membership";
+
 public static void main(String[] args) throws Exception {
 System.out.println(Arrays.toString("TRIBES-B".getBytes()));
 System.out.println(Arrays.toString("TRIBES-E".getBytes()));
diff --git a/java/org/apache/catalina/tribes/membership/McastService.java 
b/java/org/apache/catalina/tribes/membership/McastService.java
index 4c2c11917c..4768455281 100644
--- a/java/org/apache/catalina/tribes/membership/McastService.java
+++ b/java/org/apache/catalina/tribes/membership/McastService.java
@@ -38,13 +38,11 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
 /**
- * A membership implementation using simple multicast.
- * This is the representation of a multicast membership service.
- * This class is responsible for maintaining a list of active cluster nodes in 
the cluster.
- * If a node fails to send out a heartbeat, the node will be dismissed.
+ * A membership implementation using simple multicast. This is the 
representation of a multicast membership
+ * service. This class is responsible for maintaining a list of active cluster 
nodes in the cluster. If a node fails to
+ * send out a heartbeat, the node will be dismissed.
  */
-public class McastService
-extends MembershipServiceBase implements MessageListener, 
McastServiceMBean {
+public class McastService extends MembershipServiceBase implements 
MessageListener, McastServiceMBean {
 
 private static final Log log = LogFactory.getLog(McastService.class);
 
@@ -65,7 +63,7 @@ public class McastService
 /**
  * The local member
  */
-protected MemberImpl localMember ;
+protected MemberImpl localMember;
 private int mcastSoTimeout;
 private int mcastTTL;
 
@@ -82,31 +80,33 @@ public class McastService
  * Create a membership service.
  */
 public McastService() {
-//default values
+// default values
 setDefaults(this.properties);
 }
 
 /**
  * Sets the properties for the membership service.
- * @param properties
- * All are required
- * 1. mcastPort - the port to listen to
- * 2. mcastAddress - the mcast group address
- * 4. bindAddress - the bind address if any - only one that can be null
- * 5. memberDropTime - the time a member is gone before it is considered 
gone.
- * 6. mcastFrequency - the frequency of sending messages
- * 7. tcpListenPort - the port this member listens to
- * 8. tcpListenHost - the bind address of this member
+ *
+ * @param properties 
+ *   All are required

(tomcat) branch 9.0.x updated: Code clean-up - no functional change

2024-05-10 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new bbaee85a52 Code clean-up - no functional change
bbaee85a52 is described below

commit bbaee85a525d53d6366acc498f845c00ed4fa230
Author: Mark Thomas 
AuthorDate: Fri May 10 14:40:52 2024 +0100

Code clean-up - no functional change
---
 .../apache/catalina/tribes/jmx/JmxRegistry.java|   8 +-
 .../tribes/tipis/AbstractReplicatedMap.java| 690 ++---
 .../catalina/tribes/tipis/LazyReplicatedMap.java   | 170 ++---
 .../catalina/tribes/tipis/ReplicatedMap.java   | 157 ++---
 .../catalina/tribes/tipis/ReplicatedMapEntry.java  |  34 +-
 5 files changed, 539 insertions(+), 520 deletions(-)

diff --git a/java/org/apache/catalina/tribes/jmx/JmxRegistry.java 
b/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
index a22904d963..a833597fbe 100644
--- a/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
+++ b/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
@@ -36,7 +36,7 @@ public class JmxRegistry {
 
 private static final Log log = LogFactory.getLog(JmxRegistry.class);
 protected static final StringManager sm = 
StringManager.getManager(JmxRegistry.class);
-private static ConcurrentHashMap registryCache = new 
ConcurrentHashMap<>();
+private static ConcurrentHashMap registryCache = new 
ConcurrentHashMap<>();
 
 private MBeanServer mbserver = ManagementFactory.getPlatformMBeanServer();
 private ObjectName baseOname = null;
@@ -60,8 +60,8 @@ public class JmxRegistry {
 if (!jmxChannel.isJmxEnabled()) {
 return null;
 }
-ObjectName baseOn = createBaseObjectName(jmxChannel.getJmxDomain(),
-jmxChannel.getJmxPrefix(), channel.getName());
+ObjectName baseOn =
+createBaseObjectName(jmxChannel.getJmxDomain(), 
jmxChannel.getJmxPrefix(), channel.getName());
 if (baseOn == null) {
 return null;
 }
@@ -131,7 +131,7 @@ public class JmxRegistry {
 }
 
 public void unregisterJmx(ObjectName oname) {
-if (oname ==null) {
+if (oname == null) {
 return;
 }
 try {
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 01b133d660..350d2436ac 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -52,9 +52,8 @@ import org.apache.juli.logging.LogFactory;
  * @param  The type of Key
  * @param  The type of Value
  */
-public abstract class AbstractReplicatedMap
-implements Map, Serializable, RpcCallback, ChannelListener,
-MembershipListener, Heartbeat {
+public abstract class AbstractReplicatedMap
+implements Map, Serializable, RpcCallback, ChannelListener, 
MembershipListener, Heartbeat {
 
 private static final long serialVersionUID = 1L;
 
@@ -73,10 +72,10 @@ public abstract class AbstractReplicatedMap
 public static final float DEFAULT_LOAD_FACTOR = 0.75f;
 
 
-//--
-//  INSTANCE VARIABLES
-//--
-protected final ConcurrentMap> innerMap;
+// 
--
+// INSTANCE VARIABLES
+// 
--
+protected final ConcurrentMap> innerMap;
 
 protected abstract int getStateMessageType();
 
@@ -96,9 +95,7 @@ public abstract class AbstractReplicatedMap
  */
 protected transient RpcChannel rpcChannel;
 /**
- * The Map context name makes this map unique, this
- * allows us to have more than one map shared
- * through one channel
+ * The Map context name makes this map unique, this allows us to have more 
than one map shared through one channel
  */
 protected transient byte[] mapContextName;
 /**
@@ -112,7 +109,7 @@ public abstract class AbstractReplicatedMap
 /**
  * A list of members in our map
  */
-protected final transient HashMap mapMembers = new 
HashMap<>();
+protected final transient HashMap mapMembers = new 
HashMap<>();
 /**
  * Our default send options
  */
@@ -127,16 +124,13 @@ public abstract class AbstractReplicatedMap
 protected transient ClassLoader[] externalLoaders;
 
 /**
- * The node we are currently backing up data to, this index will rotate
- * on a round robin basis
+ * The node we are currently backing up data to, this index will rotate on 
a round robin basis
  */
 protected transient int currentNode = 0;
 
 /**
- *

(tomcat) branch 10.1.x updated: Code clean-up - no functional change

2024-05-10 Thread markt

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

markt 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 0e49824435 Code clean-up - no functional change
0e49824435 is described below

commit 0e49824435900afe9f49673ba5f5bd10bac1a4d1
Author: Mark Thomas 
AuthorDate: Fri May 10 14:40:44 2024 +0100

Code clean-up - no functional change
---
 .../apache/catalina/tribes/jmx/JmxRegistry.java|   8 +-
 .../tribes/tipis/AbstractReplicatedMap.java| 690 ++---
 .../catalina/tribes/tipis/LazyReplicatedMap.java   | 170 ++---
 .../catalina/tribes/tipis/ReplicatedMap.java   | 157 ++---
 .../catalina/tribes/tipis/ReplicatedMapEntry.java  |  34 +-
 5 files changed, 539 insertions(+), 520 deletions(-)

diff --git a/java/org/apache/catalina/tribes/jmx/JmxRegistry.java 
b/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
index a22904d963..a833597fbe 100644
--- a/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
+++ b/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
@@ -36,7 +36,7 @@ public class JmxRegistry {
 
 private static final Log log = LogFactory.getLog(JmxRegistry.class);
 protected static final StringManager sm = 
StringManager.getManager(JmxRegistry.class);
-private static ConcurrentHashMap registryCache = new 
ConcurrentHashMap<>();
+private static ConcurrentHashMap registryCache = new 
ConcurrentHashMap<>();
 
 private MBeanServer mbserver = ManagementFactory.getPlatformMBeanServer();
 private ObjectName baseOname = null;
@@ -60,8 +60,8 @@ public class JmxRegistry {
 if (!jmxChannel.isJmxEnabled()) {
 return null;
 }
-ObjectName baseOn = createBaseObjectName(jmxChannel.getJmxDomain(),
-jmxChannel.getJmxPrefix(), channel.getName());
+ObjectName baseOn =
+createBaseObjectName(jmxChannel.getJmxDomain(), 
jmxChannel.getJmxPrefix(), channel.getName());
 if (baseOn == null) {
 return null;
 }
@@ -131,7 +131,7 @@ public class JmxRegistry {
 }
 
 public void unregisterJmx(ObjectName oname) {
-if (oname ==null) {
+if (oname == null) {
 return;
 }
 try {
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 01b133d660..350d2436ac 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -52,9 +52,8 @@ import org.apache.juli.logging.LogFactory;
  * @param  The type of Key
  * @param  The type of Value
  */
-public abstract class AbstractReplicatedMap
-implements Map, Serializable, RpcCallback, ChannelListener,
-MembershipListener, Heartbeat {
+public abstract class AbstractReplicatedMap
+implements Map, Serializable, RpcCallback, ChannelListener, 
MembershipListener, Heartbeat {
 
 private static final long serialVersionUID = 1L;
 
@@ -73,10 +72,10 @@ public abstract class AbstractReplicatedMap
 public static final float DEFAULT_LOAD_FACTOR = 0.75f;
 
 
-//--
-//  INSTANCE VARIABLES
-//--
-protected final ConcurrentMap> innerMap;
+// 
--
+// INSTANCE VARIABLES
+// 
--
+protected final ConcurrentMap> innerMap;
 
 protected abstract int getStateMessageType();
 
@@ -96,9 +95,7 @@ public abstract class AbstractReplicatedMap
  */
 protected transient RpcChannel rpcChannel;
 /**
- * The Map context name makes this map unique, this
- * allows us to have more than one map shared
- * through one channel
+ * The Map context name makes this map unique, this allows us to have more 
than one map shared through one channel
  */
 protected transient byte[] mapContextName;
 /**
@@ -112,7 +109,7 @@ public abstract class AbstractReplicatedMap
 /**
  * A list of members in our map
  */
-protected final transient HashMap mapMembers = new 
HashMap<>();
+protected final transient HashMap mapMembers = new 
HashMap<>();
 /**
  * Our default send options
  */
@@ -127,16 +124,13 @@ public abstract class AbstractReplicatedMap
 protected transient ClassLoader[] externalLoaders;
 
 /**
- * The node we are currently backing up data to, this index will rotate
- * on a round robin basis
+ * The node we are currently backing up data to, this index will rotate on 
a round robin basis
  */
 protected transient int currentNode = 0;
 
 /**
-

(tomcat) branch main updated: Code clean-up - no functional change

2024-05-10 Thread markt

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

markt 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 273a3d1c78 Code clean-up - no functional change
273a3d1c78 is described below

commit 273a3d1c7848adf97ecb1c790be7700f49f9bb71
Author: Mark Thomas 
AuthorDate: Fri May 10 14:39:40 2024 +0100

Code clean-up - no functional change
---
 .../apache/catalina/tribes/jmx/JmxRegistry.java|   8 +-
 .../tribes/tipis/AbstractReplicatedMap.java| 690 ++---
 .../catalina/tribes/tipis/LazyReplicatedMap.java   | 170 ++---
 .../catalina/tribes/tipis/ReplicatedMap.java   | 157 ++---
 .../catalina/tribes/tipis/ReplicatedMapEntry.java  |  34 +-
 5 files changed, 539 insertions(+), 520 deletions(-)

diff --git a/java/org/apache/catalina/tribes/jmx/JmxRegistry.java 
b/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
index a22904d963..a833597fbe 100644
--- a/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
+++ b/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
@@ -36,7 +36,7 @@ public class JmxRegistry {
 
 private static final Log log = LogFactory.getLog(JmxRegistry.class);
 protected static final StringManager sm = 
StringManager.getManager(JmxRegistry.class);
-private static ConcurrentHashMap registryCache = new 
ConcurrentHashMap<>();
+private static ConcurrentHashMap registryCache = new 
ConcurrentHashMap<>();
 
 private MBeanServer mbserver = ManagementFactory.getPlatformMBeanServer();
 private ObjectName baseOname = null;
@@ -60,8 +60,8 @@ public class JmxRegistry {
 if (!jmxChannel.isJmxEnabled()) {
 return null;
 }
-ObjectName baseOn = createBaseObjectName(jmxChannel.getJmxDomain(),
-jmxChannel.getJmxPrefix(), channel.getName());
+ObjectName baseOn =
+createBaseObjectName(jmxChannel.getJmxDomain(), 
jmxChannel.getJmxPrefix(), channel.getName());
 if (baseOn == null) {
 return null;
 }
@@ -131,7 +131,7 @@ public class JmxRegistry {
 }
 
 public void unregisterJmx(ObjectName oname) {
-if (oname ==null) {
+if (oname == null) {
 return;
 }
 try {
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 01b133d660..350d2436ac 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -52,9 +52,8 @@ import org.apache.juli.logging.LogFactory;
  * @param  The type of Key
  * @param  The type of Value
  */
-public abstract class AbstractReplicatedMap
-implements Map, Serializable, RpcCallback, ChannelListener,
-MembershipListener, Heartbeat {
+public abstract class AbstractReplicatedMap
+implements Map, Serializable, RpcCallback, ChannelListener, 
MembershipListener, Heartbeat {
 
 private static final long serialVersionUID = 1L;
 
@@ -73,10 +72,10 @@ public abstract class AbstractReplicatedMap
 public static final float DEFAULT_LOAD_FACTOR = 0.75f;
 
 
-//--
-//  INSTANCE VARIABLES
-//--
-protected final ConcurrentMap> innerMap;
+// 
--
+// INSTANCE VARIABLES
+// 
--
+protected final ConcurrentMap> innerMap;
 
 protected abstract int getStateMessageType();
 
@@ -96,9 +95,7 @@ public abstract class AbstractReplicatedMap
  */
 protected transient RpcChannel rpcChannel;
 /**
- * The Map context name makes this map unique, this
- * allows us to have more than one map shared
- * through one channel
+ * The Map context name makes this map unique, this allows us to have more 
than one map shared through one channel
  */
 protected transient byte[] mapContextName;
 /**
@@ -112,7 +109,7 @@ public abstract class AbstractReplicatedMap
 /**
  * A list of members in our map
  */
-protected final transient HashMap mapMembers = new 
HashMap<>();
+protected final transient HashMap mapMembers = new 
HashMap<>();
 /**
  * Our default send options
  */
@@ -127,16 +124,13 @@ public abstract class AbstractReplicatedMap
 protected transient ClassLoader[] externalLoaders;
 
 /**
- * The node we are currently backing up data to, this index will rotate
- * on a round robin basis
+ * The node we are currently backing up data to, this index will rotate on 
a round robin basis
  */
 protected transient int currentNode = 0;
 
 /**
- * S

(tomcat) branch 9.0.x updated: Code clean-up - no functional change

2024-05-10 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new ec4deff723 Code clean-up - no functional change
ec4deff723 is described below

commit ec4deff72332b682cc08ebbef928ad9206fd342b
Author: Mark Thomas 
AuthorDate: Fri May 10 14:36:18 2024 +0100

Code clean-up - no functional change
---
 java/org/apache/catalina/tribes/io/BufferPool.java |  20 +-
 .../catalina/tribes/io/BufferPool15Impl.java   |  13 +-
 .../org/apache/catalina/tribes/io/ChannelData.java | 194 +++---
 .../tribes/io/DirectByteArrayOutputStream.java |   4 +-
 .../apache/catalina/tribes/io/ListenCallback.java  |  19 +-
 .../apache/catalina/tribes/io/ObjectReader.java|  52 ++--
 .../catalina/tribes/io/ReplicationStream.java  |  47 ++--
 .../org/apache/catalina/tribes/io/XByteBuffer.java | 288 +++--
 8 files changed, 324 insertions(+), 313 deletions(-)

diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java 
b/java/org/apache/catalina/tribes/io/BufferPool.java
index 2e68aeb862..a30ad10d7d 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool.java
@@ -24,7 +24,7 @@ import org.apache.juli.logging.LogFactory;
 public class BufferPool {
 private static final Log log = LogFactory.getLog(BufferPool.class);
 
-public static final int DEFAULT_POOL_SIZE = 100*1024*1024; //100 MiB
+public static final int DEFAULT_POOL_SIZE = 100 * 1024 * 1024; // 100 MiB
 
 protected static final StringManager sm = 
StringManager.getManager(BufferPool.class);
 
@@ -36,21 +36,21 @@ public class BufferPool {
 }
 
 public XByteBuffer getBuffer(int minSize, boolean discard) {
-if ( pool != null ) {
+if (pool != null) {
 return pool.getBuffer(minSize, discard);
 } else {
-return new XByteBuffer(minSize,discard);
+return new XByteBuffer(minSize, discard);
 }
 }
 
 public void returnBuffer(XByteBuffer buffer) {
-if ( pool != null ) {
+if (pool != null) {
 pool.returnBuffer(buffer);
 }
 }
 
 public void clear() {
-if ( pool != null ) {
+if (pool != null) {
 pool.clear();
 }
 }
@@ -60,11 +60,11 @@ public class BufferPool {
 if (instance == null) {
 synchronized (BufferPool.class) {
 if (instance == null) {
-   BufferPoolAPI pool = new BufferPool15Impl();
-   pool.setMaxSize(DEFAULT_POOL_SIZE);
-   log.info(sm.getString("bufferPool.created",
-   Integer.toString(DEFAULT_POOL_SIZE), 
pool.getClass().getName()));
-   instance = new BufferPool(pool);
+BufferPoolAPI pool = new BufferPool15Impl();
+pool.setMaxSize(DEFAULT_POOL_SIZE);
+log.info(sm.getString("bufferPool.created", 
Integer.toString(DEFAULT_POOL_SIZE),
+pool.getClass().getName()));
+instance = new BufferPool(pool);
 }
 }
 }
diff --git a/java/org/apache/catalina/tribes/io/BufferPool15Impl.java 
b/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
index 3137b2c57e..91931af6e6 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
@@ -22,8 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 class BufferPool15Impl implements BufferPool.BufferPoolAPI {
 protected int maxSize;
 protected final AtomicInteger size = new AtomicInteger(0);
-protected final ConcurrentLinkedQueue queue =
-new ConcurrentLinkedQueue<>();
+protected final ConcurrentLinkedQueue queue = new 
ConcurrentLinkedQueue<>();
 
 @Override
 public void setMaxSize(int bytes) {
@@ -34,12 +33,12 @@ class BufferPool15Impl implements BufferPool.BufferPoolAPI {
 @Override
 public XByteBuffer getBuffer(int minSize, boolean discard) {
 XByteBuffer buffer = queue.poll();
-if ( buffer != null ) {
+if (buffer != null) {
 size.addAndGet(-buffer.getCapacity());
 }
-if ( buffer == null ) {
-buffer = new XByteBuffer(minSize,discard);
-} else if ( buffer.getCapacity() <= minSize ) {
+if (buffer == null) {
+buffer = new XByteBuffer(minSize, discard);
+} else if (buffer.getCapacity() <= minSize) {
 buffer.expand(minSize);
 }
 buffer.setDiscard(discard);
@@ -49,7 +48,7 @@ class BufferPool15Impl implements BufferPool.BufferPoolAPI {
 
 @Override
 public void returnBuffer(XByteBuffer buffer) {
-if ( (size.get() + buffer.getCapacity()) <= maxSize ) {
+if ((siz

(tomcat) branch 10.1.x updated: Code clean-up - no functional change

2024-05-10 Thread markt

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

markt 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 06862790bf Code clean-up - no functional change
06862790bf is described below

commit 06862790bf354b56a74fc1e5294cf1ff24ac4055
Author: Mark Thomas 
AuthorDate: Fri May 10 14:36:07 2024 +0100

Code clean-up - no functional change
---
 java/org/apache/catalina/tribes/io/BufferPool.java |  21 +-
 .../org/apache/catalina/tribes/io/ChannelData.java | 194 +++---
 .../tribes/io/DirectByteArrayOutputStream.java |   4 +-
 .../apache/catalina/tribes/io/ListenCallback.java  |  19 +-
 .../apache/catalina/tribes/io/ObjectReader.java|  52 ++--
 .../catalina/tribes/io/ReplicationStream.java  |  47 ++--
 .../org/apache/catalina/tribes/io/XByteBuffer.java | 288 +++--
 7 files changed, 318 insertions(+), 307 deletions(-)

diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java 
b/java/org/apache/catalina/tribes/io/BufferPool.java
index 29e8804f9b..7e4736ae36 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool.java
@@ -27,8 +27,9 @@ import org.apache.juli.logging.LogFactory;
 public class BufferPool {
 private static final Log log = LogFactory.getLog(BufferPool.class);
 
-public static final int DEFAULT_POOL_SIZE =
-
Integer.getInteger("org.apache.catalina.tribes.io.BufferPool.DEFAULT_POOL_SIZE",
 100*1024*1024).intValue(); //100 MiB
+public static final int DEFAULT_POOL_SIZE = Integer
+
.getInteger("org.apache.catalina.tribes.io.BufferPool.DEFAULT_POOL_SIZE", 100 * 
1024 * 1024).intValue(); // 100
+   
  // MiB
 
 protected static final StringManager sm = 
StringManager.getManager(BufferPool.class);
 
@@ -40,8 +41,7 @@ public class BufferPool {
 if (instance == null) {
 BufferPool pool = new BufferPool();
 pool.setMaxSize(DEFAULT_POOL_SIZE);
-log.info(sm.getString("bufferPool.created",
-Integer.toString(DEFAULT_POOL_SIZE),
+log.info(sm.getString("bufferPool.created", 
Integer.toString(DEFAULT_POOL_SIZE),
 pool.getClass().getName()));
 instance = pool;
 }
@@ -55,12 +55,12 @@ public class BufferPool {
 
 public XByteBuffer getBuffer(int minSize, boolean discard) {
 XByteBuffer buffer = queue.poll();
-if ( buffer != null ) {
+if (buffer != null) {
 size.addAndGet(-buffer.getCapacity());
 }
-if ( buffer == null ) {
-buffer = new XByteBuffer(minSize,discard);
-} else if ( buffer.getCapacity() <= minSize ) {
+if (buffer == null) {
+buffer = new XByteBuffer(minSize, discard);
+} else if (buffer.getCapacity() <= minSize) {
 buffer.expand(minSize);
 }
 buffer.setDiscard(discard);
@@ -69,7 +69,7 @@ public class BufferPool {
 }
 
 public void returnBuffer(XByteBuffer buffer) {
-if ( (size.get() + buffer.getCapacity()) <= maxSize ) {
+if ((size.get() + buffer.getCapacity()) <= maxSize) {
 size.addAndGet(buffer.getCapacity());
 queue.offer(buffer);
 }
@@ -82,8 +82,7 @@ public class BufferPool {
 
 protected int maxSize;
 protected final AtomicInteger size = new AtomicInteger(0);
-protected final ConcurrentLinkedQueue queue =
-new ConcurrentLinkedQueue<>();
+protected final ConcurrentLinkedQueue queue = new 
ConcurrentLinkedQueue<>();
 
 public void setMaxSize(int bytes) {
 this.maxSize = bytes;
diff --git a/java/org/apache/catalina/tribes/io/ChannelData.java 
b/java/org/apache/catalina/tribes/io/ChannelData.java
index 8190f32798..9f94520dd6 100644
--- a/java/org/apache/catalina/tribes/io/ChannelData.java
+++ b/java/org/apache/catalina/tribes/io/ChannelData.java
@@ -26,10 +26,10 @@ import org.apache.catalina.tribes.membership.MemberImpl;
 import org.apache.catalina.tribes.util.UUIDGenerator;
 
 /**
- * The ChannelData object is used to transfer a message through 
the
- * channel interceptor stack and eventually out on a transport to be sent
- * to another node. While the message is being processed by the different
+ * The ChannelData object is used to transfer a message through 
the channel interceptor stack and
+ * eventually out on a transport to be sent to another node. While the message 
is being processed by the different
  * interceptors, the message data can be manipulated as each interceptor seems 
appropriate.
+ *
  * @author Peter Rossbach
  */
 public class ChannelData implements ChannelMessage {
@@ -42,19 +42,19 @

(tomcat) branch main updated: Code clean-up - formatting. No functional change

2024-05-10 Thread markt

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

markt 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 ada0a5ea1e Code clean-up - formatting. No functional change
ada0a5ea1e is described below

commit ada0a5ea1e18dd9cecddb914ecd441c2233886dc
Author: Mark Thomas 
AuthorDate: Fri May 10 14:32:35 2024 +0100

Code clean-up - formatting. No functional change
---
 java/org/apache/catalina/tribes/io/BufferPool.java |  21 +-
 .../org/apache/catalina/tribes/io/ChannelData.java | 194 +++---
 .../tribes/io/DirectByteArrayOutputStream.java |   4 +-
 .../apache/catalina/tribes/io/ListenCallback.java  |  19 +-
 .../apache/catalina/tribes/io/ObjectReader.java|  52 ++--
 .../catalina/tribes/io/ReplicationStream.java  |  47 ++--
 .../org/apache/catalina/tribes/io/XByteBuffer.java | 288 +++--
 7 files changed, 318 insertions(+), 307 deletions(-)

diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java 
b/java/org/apache/catalina/tribes/io/BufferPool.java
index 29e8804f9b..7e4736ae36 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool.java
@@ -27,8 +27,9 @@ import org.apache.juli.logging.LogFactory;
 public class BufferPool {
 private static final Log log = LogFactory.getLog(BufferPool.class);
 
-public static final int DEFAULT_POOL_SIZE =
-
Integer.getInteger("org.apache.catalina.tribes.io.BufferPool.DEFAULT_POOL_SIZE",
 100*1024*1024).intValue(); //100 MiB
+public static final int DEFAULT_POOL_SIZE = Integer
+
.getInteger("org.apache.catalina.tribes.io.BufferPool.DEFAULT_POOL_SIZE", 100 * 
1024 * 1024).intValue(); // 100
+   
  // MiB
 
 protected static final StringManager sm = 
StringManager.getManager(BufferPool.class);
 
@@ -40,8 +41,7 @@ public class BufferPool {
 if (instance == null) {
 BufferPool pool = new BufferPool();
 pool.setMaxSize(DEFAULT_POOL_SIZE);
-log.info(sm.getString("bufferPool.created",
-Integer.toString(DEFAULT_POOL_SIZE),
+log.info(sm.getString("bufferPool.created", 
Integer.toString(DEFAULT_POOL_SIZE),
 pool.getClass().getName()));
 instance = pool;
 }
@@ -55,12 +55,12 @@ public class BufferPool {
 
 public XByteBuffer getBuffer(int minSize, boolean discard) {
 XByteBuffer buffer = queue.poll();
-if ( buffer != null ) {
+if (buffer != null) {
 size.addAndGet(-buffer.getCapacity());
 }
-if ( buffer == null ) {
-buffer = new XByteBuffer(minSize,discard);
-} else if ( buffer.getCapacity() <= minSize ) {
+if (buffer == null) {
+buffer = new XByteBuffer(minSize, discard);
+} else if (buffer.getCapacity() <= minSize) {
 buffer.expand(minSize);
 }
 buffer.setDiscard(discard);
@@ -69,7 +69,7 @@ public class BufferPool {
 }
 
 public void returnBuffer(XByteBuffer buffer) {
-if ( (size.get() + buffer.getCapacity()) <= maxSize ) {
+if ((size.get() + buffer.getCapacity()) <= maxSize) {
 size.addAndGet(buffer.getCapacity());
 queue.offer(buffer);
 }
@@ -82,8 +82,7 @@ public class BufferPool {
 
 protected int maxSize;
 protected final AtomicInteger size = new AtomicInteger(0);
-protected final ConcurrentLinkedQueue queue =
-new ConcurrentLinkedQueue<>();
+protected final ConcurrentLinkedQueue queue = new 
ConcurrentLinkedQueue<>();
 
 public void setMaxSize(int bytes) {
 this.maxSize = bytes;
diff --git a/java/org/apache/catalina/tribes/io/ChannelData.java 
b/java/org/apache/catalina/tribes/io/ChannelData.java
index 8190f32798..9f94520dd6 100644
--- a/java/org/apache/catalina/tribes/io/ChannelData.java
+++ b/java/org/apache/catalina/tribes/io/ChannelData.java
@@ -26,10 +26,10 @@ import org.apache.catalina.tribes.membership.MemberImpl;
 import org.apache.catalina.tribes.util.UUIDGenerator;
 
 /**
- * The ChannelData object is used to transfer a message through 
the
- * channel interceptor stack and eventually out on a transport to be sent
- * to another node. While the message is being processed by the different
+ * The ChannelData object is used to transfer a message through 
the channel interceptor stack and
+ * eventually out on a transport to be sent to another node. While the message 
is being processed by the different
  * interceptors, the message data can be manipulated as each interceptor seems 
appropriate.
+ *
  * @author Peter Rossbach
  */
 public class ChannelData implements ChannelMessage

(tomcat) branch 9.0.x updated: Code clean-up - no functional change

2024-05-10 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new a285c9e732 Code clean-up - no functional change
a285c9e732 is described below

commit a285c9e732a19fc73450fbde733c21469b4dd70f
Author: Mark Thomas 
AuthorDate: Fri May 10 13:46:09 2024 +0100

Code clean-up - no functional change
---
 .../catalina/tribes/group/AbsoluteOrder.java   |  62 ++---
 .../catalina/tribes/group/ChannelCoordinator.java  | 147 ++--
 .../tribes/group/ChannelInterceptorBase.java   |  30 +--
 .../catalina/tribes/group/ExtendedRpcCallback.java |  18 +-
 .../apache/catalina/tribes/group/GroupChannel.java | 257 ++---
 .../catalina/tribes/group/GroupChannelMBean.java   |  10 +-
 .../catalina/tribes/group/InterceptorPayload.java  |   2 +-
 .../org/apache/catalina/tribes/group/Response.java |   1 +
 .../apache/catalina/tribes/group/RpcCallback.java  |  15 +-
 .../apache/catalina/tribes/group/RpcChannel.java   | 111 -
 .../apache/catalina/tribes/group/RpcMessage.java   |   8 +-
 11 files changed, 328 insertions(+), 333 deletions(-)

diff --git a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java 
b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
index 1e06dc1f09..df889928e7 100644
--- a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
+++ b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
@@ -24,19 +24,22 @@ import java.util.List;
 import org.apache.catalina.tribes.Member;
 
 /**
- * Title: Membership - Absolute Order
- *
- * Description: A simple, yet agreeable and efficient way of ordering 
members
  * 
- *Ordering members can serve as a basis for electing a leader or 
coordinating efforts.
- *This is stinky simple, it works on the basis of the Member 
interface
- *and orders members in the following format:
+ * Title: Membership - Absolute Order
+ * 
+ * 
+ * Description: A simple, yet agreeable and efficient way of ordering members
+ * 
+ * 
+ * Ordering members can serve as a basis for electing a leader or coordinating 
efforts.
+ * This is stinky simple, it works on the basis of the Member 
interface and orders members in the following
+ * format:
  * 
  * 
- * IP comparison - byte by byte, lower byte higher rank
- * IPv4 addresses rank higher than IPv6, ie the lesser number of 
bytes, the higher rank
- * Port comparison - lower port, higher rank
- * UniqueId comparison- byte by byte, lower byte higher rank
+ * IP comparison - byte by byte, lower byte higher rank
+ * IPv4 addresses rank higher than IPv6, ie the lesser number of bytes, 
the higher rank
+ * Port comparison - lower port, higher rank
+ * UniqueId comparison- byte by byte, lower byte higher rank
  * 
  *
  * @see org.apache.catalina.tribes.Member
@@ -50,55 +53,54 @@ public class AbsoluteOrder {
 
 
 public static void absoluteOrder(Member[] members) {
-if ( members == null || members.length <= 1 ) {
+if (members == null || members.length <= 1) {
 return;
 }
-Arrays.sort(members,comp);
+Arrays.sort(members, comp);
 }
 
 public static void absoluteOrder(List members) {
-if ( members == null || members.size() <= 1 ) {
+if (members == null || members.size() <= 1) {
 return;
 }
 members.sort(comp);
 }
 
-public static class AbsoluteComparator implements Comparator,
-Serializable {
+public static class AbsoluteComparator implements Comparator, 
Serializable {
 
 private static final long serialVersionUID = 1L;
 
 @Override
 public int compare(Member m1, Member m2) {
-int result = compareIps(m1,m2);
-if ( result == 0 ) {
-result = comparePorts(m1,m2);
+int result = compareIps(m1, m2);
+if (result == 0) {
+result = comparePorts(m1, m2);
 }
-if ( result == 0 ) {
-result = compareIds(m1,m2);
+if (result == 0) {
+result = compareIds(m1, m2);
 }
 return result;
 }
 
 public int compareIps(Member m1, Member m2) {
-return compareBytes(m1.getHost(),m2.getHost());
+return compareBytes(m1.getHost(), m2.getHost());
 }
 
 public int comparePorts(Member m1, Member m2) {
-return compareInts(m1.getPort(),m2.getPort());
+return compareInts(m1.getPort(), m2.getPort());
 }
 
 public int compareIds(Member m1, Member m2) {
-return compareBytes(m1.getUniqueId(),m2.getUniqueId());
+return compareBytes(m1.getUniqueId(), m2.getUniqueId());
 }
 
 protected int compareBytes(byte[] d1, byte[] d2) {
 int result = 0;
-if ( d1.length == d2.

(tomcat) branch 10.1.x updated: Code clean-up - no functional change

2024-05-10 Thread markt

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

markt 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 f64ed49efe Code clean-up - no functional change
f64ed49efe is described below

commit f64ed49efea733637987e01716569ca172fa9e49
Author: Mark Thomas 
AuthorDate: Fri May 10 13:45:49 2024 +0100

Code clean-up - no functional change
---
 .../catalina/tribes/group/AbsoluteOrder.java   |  62 ++---
 .../catalina/tribes/group/ChannelCoordinator.java  | 147 ++--
 .../tribes/group/ChannelInterceptorBase.java   |  30 +--
 .../catalina/tribes/group/ExtendedRpcCallback.java |  18 +-
 .../apache/catalina/tribes/group/GroupChannel.java | 257 ++---
 .../catalina/tribes/group/GroupChannelMBean.java   |  10 +-
 .../catalina/tribes/group/InterceptorPayload.java  |   2 +-
 .../org/apache/catalina/tribes/group/Response.java |   1 +
 .../apache/catalina/tribes/group/RpcCallback.java  |  15 +-
 .../apache/catalina/tribes/group/RpcChannel.java   | 111 -
 .../apache/catalina/tribes/group/RpcMessage.java   |   8 +-
 11 files changed, 328 insertions(+), 333 deletions(-)

diff --git a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java 
b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
index 1e06dc1f09..df889928e7 100644
--- a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
+++ b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
@@ -24,19 +24,22 @@ import java.util.List;
 import org.apache.catalina.tribes.Member;
 
 /**
- * Title: Membership - Absolute Order
- *
- * Description: A simple, yet agreeable and efficient way of ordering 
members
  * 
- *Ordering members can serve as a basis for electing a leader or 
coordinating efforts.
- *This is stinky simple, it works on the basis of the Member 
interface
- *and orders members in the following format:
+ * Title: Membership - Absolute Order
+ * 
+ * 
+ * Description: A simple, yet agreeable and efficient way of ordering members
+ * 
+ * 
+ * Ordering members can serve as a basis for electing a leader or coordinating 
efforts.
+ * This is stinky simple, it works on the basis of the Member 
interface and orders members in the following
+ * format:
  * 
  * 
- * IP comparison - byte by byte, lower byte higher rank
- * IPv4 addresses rank higher than IPv6, ie the lesser number of 
bytes, the higher rank
- * Port comparison - lower port, higher rank
- * UniqueId comparison- byte by byte, lower byte higher rank
+ * IP comparison - byte by byte, lower byte higher rank
+ * IPv4 addresses rank higher than IPv6, ie the lesser number of bytes, 
the higher rank
+ * Port comparison - lower port, higher rank
+ * UniqueId comparison- byte by byte, lower byte higher rank
  * 
  *
  * @see org.apache.catalina.tribes.Member
@@ -50,55 +53,54 @@ public class AbsoluteOrder {
 
 
 public static void absoluteOrder(Member[] members) {
-if ( members == null || members.length <= 1 ) {
+if (members == null || members.length <= 1) {
 return;
 }
-Arrays.sort(members,comp);
+Arrays.sort(members, comp);
 }
 
 public static void absoluteOrder(List members) {
-if ( members == null || members.size() <= 1 ) {
+if (members == null || members.size() <= 1) {
 return;
 }
 members.sort(comp);
 }
 
-public static class AbsoluteComparator implements Comparator,
-Serializable {
+public static class AbsoluteComparator implements Comparator, 
Serializable {
 
 private static final long serialVersionUID = 1L;
 
 @Override
 public int compare(Member m1, Member m2) {
-int result = compareIps(m1,m2);
-if ( result == 0 ) {
-result = comparePorts(m1,m2);
+int result = compareIps(m1, m2);
+if (result == 0) {
+result = comparePorts(m1, m2);
 }
-if ( result == 0 ) {
-result = compareIds(m1,m2);
+if (result == 0) {
+result = compareIds(m1, m2);
 }
 return result;
 }
 
 public int compareIps(Member m1, Member m2) {
-return compareBytes(m1.getHost(),m2.getHost());
+return compareBytes(m1.getHost(), m2.getHost());
 }
 
 public int comparePorts(Member m1, Member m2) {
-return compareInts(m1.getPort(),m2.getPort());
+return compareInts(m1.getPort(), m2.getPort());
 }
 
 public int compareIds(Member m1, Member m2) {
-return compareBytes(m1.getUniqueId(),m2.getUniqueId());
+return compareBytes(m1.getUniqueId(), m2.getUniqueId());
 }
 
 protected int compareBytes(byte[] d1, byte[] d2) {
 int result = 0;
-if ( d1.length == d

(tomcat) branch main updated: Code clean-up - no functional change

2024-05-10 Thread markt

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

markt 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 041ac35e83 Code clean-up - no functional change
041ac35e83 is described below

commit 041ac35e83915383bb285e08a275eb95954c5a63
Author: Mark Thomas 
AuthorDate: Fri May 10 13:45:31 2024 +0100

Code clean-up - no functional change
---
 .../catalina/tribes/group/AbsoluteOrder.java   |  62 ++---
 .../catalina/tribes/group/ChannelCoordinator.java  | 147 ++--
 .../tribes/group/ChannelInterceptorBase.java   |  30 +--
 .../catalina/tribes/group/ExtendedRpcCallback.java |  18 +-
 .../apache/catalina/tribes/group/GroupChannel.java | 257 ++---
 .../catalina/tribes/group/GroupChannelMBean.java   |  10 +-
 .../catalina/tribes/group/InterceptorPayload.java  |   2 +-
 .../org/apache/catalina/tribes/group/Response.java |   1 +
 .../apache/catalina/tribes/group/RpcCallback.java  |  15 +-
 .../apache/catalina/tribes/group/RpcChannel.java   | 111 -
 .../apache/catalina/tribes/group/RpcMessage.java   |   8 +-
 11 files changed, 328 insertions(+), 333 deletions(-)

diff --git a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java 
b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
index 1e06dc1f09..df889928e7 100644
--- a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
+++ b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
@@ -24,19 +24,22 @@ import java.util.List;
 import org.apache.catalina.tribes.Member;
 
 /**
- * Title: Membership - Absolute Order
- *
- * Description: A simple, yet agreeable and efficient way of ordering 
members
  * 
- *Ordering members can serve as a basis for electing a leader or 
coordinating efforts.
- *This is stinky simple, it works on the basis of the Member 
interface
- *and orders members in the following format:
+ * Title: Membership - Absolute Order
+ * 
+ * 
+ * Description: A simple, yet agreeable and efficient way of ordering members
+ * 
+ * 
+ * Ordering members can serve as a basis for electing a leader or coordinating 
efforts.
+ * This is stinky simple, it works on the basis of the Member 
interface and orders members in the following
+ * format:
  * 
  * 
- * IP comparison - byte by byte, lower byte higher rank
- * IPv4 addresses rank higher than IPv6, ie the lesser number of 
bytes, the higher rank
- * Port comparison - lower port, higher rank
- * UniqueId comparison- byte by byte, lower byte higher rank
+ * IP comparison - byte by byte, lower byte higher rank
+ * IPv4 addresses rank higher than IPv6, ie the lesser number of bytes, 
the higher rank
+ * Port comparison - lower port, higher rank
+ * UniqueId comparison- byte by byte, lower byte higher rank
  * 
  *
  * @see org.apache.catalina.tribes.Member
@@ -50,55 +53,54 @@ public class AbsoluteOrder {
 
 
 public static void absoluteOrder(Member[] members) {
-if ( members == null || members.length <= 1 ) {
+if (members == null || members.length <= 1) {
 return;
 }
-Arrays.sort(members,comp);
+Arrays.sort(members, comp);
 }
 
 public static void absoluteOrder(List members) {
-if ( members == null || members.size() <= 1 ) {
+if (members == null || members.size() <= 1) {
 return;
 }
 members.sort(comp);
 }
 
-public static class AbsoluteComparator implements Comparator,
-Serializable {
+public static class AbsoluteComparator implements Comparator, 
Serializable {
 
 private static final long serialVersionUID = 1L;
 
 @Override
 public int compare(Member m1, Member m2) {
-int result = compareIps(m1,m2);
-if ( result == 0 ) {
-result = comparePorts(m1,m2);
+int result = compareIps(m1, m2);
+if (result == 0) {
+result = comparePorts(m1, m2);
 }
-if ( result == 0 ) {
-result = compareIds(m1,m2);
+if (result == 0) {
+result = compareIds(m1, m2);
 }
 return result;
 }
 
 public int compareIps(Member m1, Member m2) {
-return compareBytes(m1.getHost(),m2.getHost());
+return compareBytes(m1.getHost(), m2.getHost());
 }
 
 public int comparePorts(Member m1, Member m2) {
-return compareInts(m1.getPort(),m2.getPort());
+return compareInts(m1.getPort(), m2.getPort());
 }
 
 public int compareIds(Member m1, Member m2) {
-return compareBytes(m1.getUniqueId(),m2.getUniqueId());
+return compareBytes(m1.getUniqueId(), m2.getUniqueId());
 }
 
 protected int compareBytes(byte[] d1, byte[] d2) {
 int result = 0;
-if ( d1.length == d2.le

Re: [VOTE] Release Apache Tomcat 10.1.24

2024-05-10 Thread Romain Manni-Bucau

Thanks Mark.

+1 then, tested on several embed servers which use the standard artifacts
(Yupiik Fusion, Apache Meecrowave apps, ...).

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le ven. 10 mai 2024 à 12:26, Mark Thomas  a écrit :

> On 10/05/2024 11:22, Romain Manni-Bucau wrote:
> > Hi Christopher,
> >
> > Is it possible to close the staging repo please (I get a 404)?
>
> There is a typo in the VOTE email. The correct staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1495
>
> Mark
>
>
> >
> > Best,
> > Romain Manni-Bucau
> > @rmannibucau  |  Blog
> >  | Old Blog
> >  | Github <
> https://github.com/rmannibucau> |
> > LinkedIn  | Book
> > <
> https://www.packtpub.com/application-development/java-ee-8-high-performance
> >
> >
> >
> > Le ven. 10 mai 2024 à 10:00, Mark Thomas  a écrit :
> >
> >> On 09/05/2024 19:12, Christopher Schultz wrote:
> >>
> >>> The proposed 10.1.24 release is:
> >>> [ ] Broken - do not release
> >>> [X] Stable - go ahead and release as 10.1.24
> >>
> >> Tests pass on Linux, Windows, MacOS (Intel) and MacOS (M1).
> >>
> >> Build is cross platform reproducible (Linux / Windows).
> >>
> >> Mark
> >>
> >> -
> >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> >> For additional commands, e-mail: dev-h...@tomcat.apache.org
> >>
> >>
> >
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: [VOTE] Release Apache Tomcat 10.1.24

2024-05-10 Thread Mark Thomas


On 10/05/2024 11:22, Romain Manni-Bucau wrote:

Hi Christopher,

Is it possible to close the staging repo please (I get a 404)?


There is a typo in the VOTE email. The correct staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1495

Mark




Best,
Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le ven. 10 mai 2024 à 10:00, Mark Thomas  a écrit :


On 09/05/2024 19:12, Christopher Schultz wrote:


The proposed 10.1.24 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 10.1.24


Tests pass on Linux, Windows, MacOS (Intel) and MacOS (M1).

Build is cross platform reproducible (Linux / Windows).

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org






-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 10.1.24

2024-05-10 Thread Romain Manni-Bucau

Hi Christopher,

Is it possible to close the staging repo please (I get a 404)?

Best,
Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le ven. 10 mai 2024 à 10:00, Mark Thomas  a écrit :

> On 09/05/2024 19:12, Christopher Schultz wrote:
>
> > The proposed 10.1.24 release is:
> > [ ] Broken - do not release
> > [X] Stable - go ahead and release as 10.1.24
>
> Tests pass on Linux, Windows, MacOS (Intel) and MacOS (M1).
>
> Build is cross platform reproducible (Linux / Windows).
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: [VOTE] Release Apache Tomcat 10.1.24

2024-05-10 Thread Mark Thomas


On 09/05/2024 19:12, Christopher Schultz wrote:


The proposed 10.1.24 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 10.1.24


Tests pass on Linux, Windows, MacOS (Intel) and MacOS (M1).

Build is cross platform reproducible (Linux / Windows).

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 10.1.24

(tomcat) branch 9.0.x updated: Code clean-up - formatting. No functional change

(tomcat) branch 10.1.x updated: Code clean-up - formatting. No functional change

(tomcat) branch main updated: Code clean-up - formatting. No functional change

(tomcat) branch 9.0.x updated: Align with 10.1.x and 11.0.x

(tomcat) branch 10.1.x updated: Align with 11.0.x

(tomcat) branch 9.0.x updated: Code clean-up - no functional change

(tomcat) branch 10.1.x updated: Code clean-up - no functional change

(tomcat) branch main updated: Code clean-up - no functional change

(tomcat) branch 9.0.x updated: Code clean-up - no functional change

(tomcat) branch 10.1.x updated: Code clean-up - no functional change

(tomcat) branch main updated: Code clean-up - no functional change

(tomcat) branch 9.0.x updated: Code clean-up - no functional change

(tomcat) branch 10.1.x updated: Code clean-up - no functional change

(tomcat) branch main updated: Code clean-up - formatting. No functional change

(tomcat) branch 9.0.x updated: Code clean-up - no functional change

(tomcat) branch 10.1.x updated: Code clean-up - no functional change

(tomcat) branch main updated: Code clean-up - no functional change

Re: [VOTE] Release Apache Tomcat 10.1.24

Re: [VOTE] Release Apache Tomcat 10.1.24

Re: [VOTE] Release Apache Tomcat 10.1.24

Re: [VOTE] Release Apache Tomcat 10.1.24

22 matches

Site Navigation

Mail list logo

Footer information