Skip to content

Commit 052d026

Browse files
committed
Fix some review issues
1 parent 6218ec8 commit 052d026

4 files changed

Lines changed: 10 additions & 3 deletions

File tree

java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ public int getReplayWindowSize() {
315315
@Override
316316
public void setReplayWindowSize(int replayWindowSize) {
317317
if (replayWindowSize < 1) {
318-
throw new IllegalArgumentException("replayWindowSize must be greater than zero");
318+
throw new IllegalArgumentException(sm.getString("encryptInterceptor.replayWindow.tooSmall"));
319319
}
320320
this.replayWindowSize = replayWindowSize;
321321
}
@@ -544,7 +544,10 @@ public Long getRemovedMemberHeadValue(Member member) {
544544
private CyclicTracker createTrackerForMember(Member member) {
545545
CyclicTracker tracker = new CyclicTracker(replayWindowSize);
546546
Long headValue = messageNumbersByRemovedMember.remove(member);
547-
if (headValue != null) {
547+
if (headValue == null) {
548+
// This is a new member. First valid message will be 0. Therefore set last message to -1.
549+
tracker.track(-1);
550+
} else {
548551
tracker.track(headValue.longValue());
549552
}
550553
return tracker;

java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ encryptInterceptor.decrypt.replay=Failed to decrypt message: replay attack detec
2525
encryptInterceptor.encrypt.failed=Failed to encrypt message
2626
encryptInterceptor.init.failed=Failed to initialize EncryptInterceptor
2727
encryptInterceptor.key.required=Encryption key is required
28+
encryptInterceptor.replayWindow.tooSmall=replayWindowSize must be greater than zero
2829
encryptInterceptor.tcpFailureDetector.ordering=EncryptInterceptor must be upstream of TcpFailureDetector. Please re-order EncryptInterceptor to be listed before TcpFailureDetector in your channel interceptor pipeline.
2930

3031
fragmentationInterceptor.fragments.missing=Fragments are missing.

java/org/apache/catalina/tribes/util/CyclicTracker.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
*/
2525
public class CyclicTracker {
2626

27+
private static final StringManager sm = StringManager.getManager(CyclicTracker.class);
28+
2729
private final boolean[] seen;
2830

2931
private boolean initialized = false;
@@ -33,7 +35,7 @@ public class CyclicTracker {
3335

3436
public CyclicTracker(int size) {
3537
if (size < 1) {
36-
throw new IllegalArgumentException("size must be greater than zero");
38+
throw new IllegalArgumentException(sm.getString("cyclicTracker.size.tooSmall"));
3739
}
3840
seen = new boolean[size];
3941
}

java/org/apache/catalina/tribes/util/LocalStrings.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ arrays.length.outOfBounds=not enough data elements in the key, length is out of
1818
arrays.malformed.arrays=byte arrays must be represented as {1,3,4,5,6}
1919
arrays.srcoffset.outOfBounds=srcoffset is out of bounds.
2020

21+
cyclicTracker.size.tooSmall=size must be greater than zero
2122
executorFactory.not.running=Executor not running, can't force a command into the queues
2223
executorFactory.queue.full=Queue capacity is full.
2324

0 commit comments

Comments
 (0)