Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J2-1349-gcfree-threadcontext ca735dd96 -> 996d54b18
LOG4J2-1349 fix broken test: getContext() should return mutable map Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/70807a58 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/70807a58 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/70807a58 Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext Commit: 70807a5812978a58df5d11bae4ff508a2aa33907 Parents: ca735dd Author: rpopma <[email protected]> Authored: Wed Aug 31 22:52:11 2016 +0900 Committer: rpopma <[email protected]> Committed: Wed Aug 31 22:52:11 2016 +0900 ---------------------------------------------------------------------- .../logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java | 3 ++- .../logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/70807a58/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java index afa9d99..1ccb81b 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java @@ -17,6 +17,7 @@ package org.apache.logging.log4j.spi; import java.util.Collections; +import java.util.HashMap; import java.util.Map; import org.apache.logging.log4j.util.PropertiesUtil; @@ -148,7 +149,7 @@ public class CopyOnWriteSortedArrayThreadContextMap implements ThreadContextMap, @Override public Map<String, String> getCopy() { final MutableContextData map = localMap.get(); - return map == null ? Collections.<String, String>emptyMap() : map.asMap(); + return map == null ? new HashMap<String, String>() : map.asMap(); } /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/70807a58/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java index 7d94831..da04829 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java @@ -17,6 +17,7 @@ package org.apache.logging.log4j.spi; import java.util.Collections; +import java.util.HashMap; import java.util.Map; import org.apache.logging.log4j.util.PropertiesUtil; @@ -150,7 +151,7 @@ public class GarbageFreeSortedArrayThreadContextMap implements ThreadContextMap, @Override public Map<String, String> getCopy() { final MutableContextData map = localMap.get(); - return map == null ? Collections.<String, String>emptyMap() : map.asMap(); + return map == null ? new HashMap<String, String>() : map.asMap(); } /**
