You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/09/11 06:28:17 UTC
[36/50] logging-log4j2 git commit: LOG4J2-1349 bugfix: putAll()
should not overwrite existing values
LOG4J2-1349 bugfix: putAll() should not overwrite existing values
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/863cc124
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/863cc124
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/863cc124
Branch: refs/heads/master
Commit: 863cc124dfdc0fe05128a8c144c6413f92b5d99f
Parents: e59f15f
Author: rpopma <rp...@apache.org>
Authored: Sun Sep 4 15:56:02 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Sep 4 15:56:02 2016 +0900
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/util/ArrayContextData.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/863cc124/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java
index 3b665b3..01b2c8c 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java
@@ -243,7 +243,7 @@ public class ArrayContextData implements MutableContextData, ThreadContextMap {
assertNotFrozen();
assertNoConcurrentModification();
- if (source instanceof ArrayContextData) {
+ if (source instanceof ArrayContextData && this.size == 0) {
initFrom0((ArrayContextData) source);
} else if (source != null) {
if (source == this) {