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/08/12 12:23:04 UTC
logging-log4j2 git commit: LOG4J2-1447 remove unnecessary cast to
ArrayContextData
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure a12913d7c -> 7320dd35a
LOG4J2-1447 remove unnecessary cast to ArrayContextData
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7320dd35
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7320dd35
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7320dd35
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 7320dd35aca874663cdd729a35703b937b65fb56
Parents: a12913d
Author: rpopma <rp...@apache.org>
Authored: Fri Aug 12 21:23:13 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Aug 12 21:23:13 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/core/impl/ThreadContextDataInjector.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7320dd35/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
index 827438e..ddb26a0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
@@ -63,11 +63,9 @@ public class ThreadContextDataInjector implements ContextDataInjector {
}
}
- private void copyThreadContextMap(final ThreadContextMap contextMap,
- final MutableContextData contextData) {
-
- if (contextMap instanceof ContextData && contextData instanceof ArrayContextData) {
- ((ArrayContextData) contextData).putAll((ContextData) contextMap);
+ private void copyThreadContextMap(final ThreadContextMap contextMap, final MutableContextData contextData) {
+ if (contextMap instanceof ContextData) {
+ contextData.putAll((ContextData) contextMap);
} else {
if (contextMap != null) {
copyThreadContextMap(contextMap.getImmutableMapOrNull(), contextData);