This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 6a3467ff2b Review "Count entries with a null value in the size of a
replicated map"
6a3467ff2b is described below
commit 6a3467ff2b8a846e466c3b7e3b44f62d03657415
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Oct 23 12:14:14 2026 +0100
Review "Count entries with a null value in the size of a replicated map"
Fix containsValue() gap in null handling
Co-authored by: CoPilot / GPT-5.6 Sol
---
java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java | 3 +--
test/org/apache/catalina/tribes/tipis/TestAbstractReplicatedMap.java | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index f5ba6affed..838f1d1318 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -1541,10 +1541,9 @@ public abstract class AbstractReplicatedMap<K, V>
@Override
public boolean containsValue(Object value) {
- Objects.requireNonNull(value);
for (Entry<K,MapEntry<K,V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
- if (entry != null && entry.isActive() &&
value.equals(entry.getValue())) {
+ if (entry != null && entry.isActive() && Objects.equals(value,
entry.getValue())) {
return true;
}
}
diff --git
a/test/org/apache/catalina/tribes/tipis/TestAbstractReplicatedMap.java
b/test/org/apache/catalina/tribes/tipis/TestAbstractReplicatedMap.java
index 9f00e038e7..2dd2f233e0 100644
--- a/test/org/apache/catalina/tribes/tipis/TestAbstractReplicatedMap.java
+++ b/test/org/apache/catalina/tribes/tipis/TestAbstractReplicatedMap.java
@@ -380,6 +380,9 @@ public class TestAbstractReplicatedMap {
Assert.assertEquals(2, map.values().size());
Assert.assertFalse(map.isEmpty());
Assert.assertTrue(map.values().contains(null));
+ Assert.assertTrue(map.containsValue(null));
+ Assert.assertTrue(map.containsValue("value"));
+ Assert.assertFalse(map.containsValue("missing"));
}
private static final class SerialKey implements Serializable {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
