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/02 14:44:15 UTC
[2/3] logging-log4j2 git commit: LOG4J2-1349 obtain context data
object through the factory, don't instantiate directly
LOG4J2-1349 obtain context data object through the factory, don't instantiate directly
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/112a2220
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/112a2220
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/112a2220
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 112a22201a345f0b925e52d3f0a3caa1228565fe
Parents: fb7c8ea
Author: rpopma <rp...@apache.org>
Authored: Fri Sep 2 23:42:41 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Sep 2 23:42:41 2016 +0900
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/112a2220/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
index e45a405..8e152f3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
@@ -26,7 +26,6 @@ import java.util.Objects;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.spi.ArrayContextData;
import org.apache.logging.log4j.spi.ContextData;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.async.RingBufferLogEvent;
@@ -910,7 +909,9 @@ public class Log4jLogEvent implements LogEvent {
}
private static MutableContextData memento(final ContextData data) {
- return new ArrayContextData(data); // TODO necessary to construct new instance?
+ MutableContextData result = ContextDataFactory.createContextData();
+ result.putAll(data);
+ return result;
}
/**