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 022d601378 Fix some review issues
022d601378 is described below
commit 022d6013780f6f8488400eec7a2f9291dfa4beff
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Jun 17 14:18:53 2026 +0100
Fix some review issues
---
.../catalina/tribes/group/interceptors/EncryptInterceptor.java | 7 +++++--
.../catalina/tribes/group/interceptors/LocalStrings.properties | 1 +
java/org/apache/catalina/tribes/util/CyclicTracker.java | 4 +++-
java/org/apache/catalina/tribes/util/LocalStrings.properties | 1 +
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
b/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
index 9c33f13728..19d50200a9 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
@@ -316,7 +316,7 @@ public class EncryptInterceptor extends
ChannelInterceptorBase implements Encryp
@Override
public void setReplayWindowSize(int replayWindowSize) {
if (replayWindowSize < 1) {
- throw new IllegalArgumentException("replayWindowSize must be
greater than zero");
+ throw new
IllegalArgumentException(sm.getString("encryptInterceptor.replayWindow.tooSmall"));
}
this.replayWindowSize = replayWindowSize;
}
@@ -545,7 +545,10 @@ public class EncryptInterceptor extends
ChannelInterceptorBase implements Encryp
private CyclicTracker createTrackerForMember(Member member) {
CyclicTracker tracker = new CyclicTracker(replayWindowSize);
Long headValue = messageNumbersByRemovedMember.remove(member);
- if (headValue != null) {
+ if (headValue == null) {
+ // This is a new member. First valid message will be 0.
Therefore set last message to -1.
+ tracker.track(-1);
+ } else {
tracker.track(headValue.longValue());
}
return tracker;
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
index ccece8a6a3..2bbb511f1d 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
@@ -28,6 +28,7 @@ encryptInterceptor.decrypt.replay=Failed to decrypt message:
replay attack detec
encryptInterceptor.encrypt.failed=Failed to encrypt message
encryptInterceptor.init.failed=Failed to initialize EncryptInterceptor
encryptInterceptor.key.required=Encryption key is required
+encryptInterceptor.replayWindow.tooSmall=replayWindowSize must be greater than
zero
encryptInterceptor.tcpFailureDetector.ordering=EncryptInterceptor must be
upstream of TcpFailureDetector. Please re-order EncryptInterceptor to be listed
before TcpFailureDetector in your channel interceptor pipeline.
fragmentationInterceptor.fragments.missing=Fragments are missing.
diff --git a/java/org/apache/catalina/tribes/util/CyclicTracker.java
b/java/org/apache/catalina/tribes/util/CyclicTracker.java
index 09336ada78..509df9e580 100644
--- a/java/org/apache/catalina/tribes/util/CyclicTracker.java
+++ b/java/org/apache/catalina/tribes/util/CyclicTracker.java
@@ -24,6 +24,8 @@ package org.apache.catalina.tribes.util;
*/
public class CyclicTracker {
+ private static final StringManager sm =
StringManager.getManager(CyclicTracker.class);
+
private final boolean[] seen;
private boolean initialized = false;
@@ -33,7 +35,7 @@ public class CyclicTracker {
public CyclicTracker(int size) {
if (size < 1) {
- throw new IllegalArgumentException("size must be greater than
zero");
+ throw new
IllegalArgumentException(sm.getString("cyclicTracker.size.tooSmall"));
}
seen = new boolean[size];
}
diff --git a/java/org/apache/catalina/tribes/util/LocalStrings.properties
b/java/org/apache/catalina/tribes/util/LocalStrings.properties
index d26bc13628..a9acf46578 100644
--- a/java/org/apache/catalina/tribes/util/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/util/LocalStrings.properties
@@ -21,6 +21,7 @@ arrays.length.outOfBounds=not enough data elements in the
key, length is out of
arrays.malformed.arrays=byte arrays must be represented as {1,3,4,5,6}
arrays.srcoffset.outOfBounds=srcoffset is out of bounds.
+cyclicTracker.size.tooSmall=size must be greater than zero
executorFactory.not.running=Executor not running, can't force a command into
the queues
executorFactory.queue.full=Queue capacity is full.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
