You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/09/12 15:23:37 UTC
(logging-log4j2) 01/02: Fix bug in `DefaultThreadContextMap.putAll()`
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.24.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 2524c0e3a308a98624908ff0373c561389608794
Author: yangjie01 <ya...@baidu.com>
AuthorDate: Wed Sep 11 01:32:03 2024 +0800
Fix bug in `DefaultThreadContextMap.putAll()`
---
.../log4j/internal/map/UnmodifiableArrayBackedMapTest.java | 13 +++++++------
.../log4j/internal/map/UnmodifiableArrayBackedMap.java | 1 +
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java
index 5957a931bf..3f43e3e2c4 100644
--- a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java
+++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java
@@ -55,18 +55,19 @@ public class UnmodifiableArrayBackedMapTest {
@Test
public void testCopyAndPut() {
UnmodifiableArrayBackedMap testMap = UnmodifiableArrayBackedMap.EMPTY_MAP;
- testMap = testMap.copyAndPut("1", "value1");
- assertTrue(testMap.containsKey("1"));
- assertEquals(testMap.get("1"), "value1");
+ testMap = testMap.copyAndPut("6", "value6");
+ assertTrue(testMap.containsKey("6"));
+ assertEquals(testMap.get("6"), "value6");
- testMap = testMap.copyAndPut("1", "another value");
- assertTrue(testMap.containsKey("1"));
- assertEquals(testMap.get("1"), "another value");
+ testMap = testMap.copyAndPut("6", "another value");
+ assertTrue(testMap.containsKey("6"));
+ assertEquals(testMap.get("6"), "another value");
HashMap<String, String> newValues = getTestParameters();
testMap = testMap.copyAndPutAll(newValues);
assertEquals(testMap.get("1"), "value1");
assertEquals(testMap.get("4"), "value4");
+ assertEquals(testMap.get("6"), "another value");
}
@Test
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java
index cab4dc2eb7..eada687424 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java
@@ -282,6 +282,7 @@ public class UnmodifiableArrayBackedMap extends AbstractMap<String, String> impl
// copy the contents of the current map (if any)
if (numEntries > 0) {
System.arraycopy(backingArray, 0, newMap.backingArray, 0, numEntries * 2 + 1);
+ newMap.numEntries = numEntries;
}
for (Map.Entry<String, String> entry : entriesToAdd.entrySet()) {