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/23 13:42:20 UTC
[02/23] logging-log4j2 git commit: ThreadContextMap2 extends
ThreadContextMap.
ThreadContextMap2 extends ThreadContextMap.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d145cdbb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d145cdbb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d145cdbb
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: d145cdbb3a125894e13f33ee92ed19332a6c3beb
Parents: 0b1c77d
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 15:58:13 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 15:58:13 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java | 2 +-
.../main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java | 2 +-
.../src/main/java/org/apache/logging/slf4j/MDCContextMap.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d145cdbb/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
index a45ece5..92822b9 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.util.PropertiesUtil;
* expected that the Map will be passed to many more log events than the number of keys it contains the performance
* should be much better than if the Map was copied for each event.
*/
-public class DefaultThreadContextMap implements ThreadContextMap, ThreadContextMap2 {
+public class DefaultThreadContextMap implements ThreadContextMap2 {
/**
* Property name ({@value} ) for selecting {@code InheritableThreadLocal} (value "true") or plain
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d145cdbb/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
index 7eba48d..4def1b3 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
@@ -25,7 +25,7 @@ import java.util.Map;
* @see ThreadContextMap
* @since 2.7
*/
-public interface ThreadContextMap2 {
+public interface ThreadContextMap2 extends ThreadContextMap {
/**
* Puts all given context map entries into the current thread's
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d145cdbb/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java
----------------------------------------------------------------------
diff --git a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java
index 9b0251a..4ec6896 100644
--- a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java
+++ b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java
@@ -26,7 +26,7 @@ import org.slf4j.MDC;
/**
* Bind the ThreadContextMap to the SLF4J MDC.
*/
-public class MDCContextMap implements ThreadContextMap, ThreadContextMap2 {
+public class MDCContextMap implements ThreadContextMap2 {
@Override
public void put(final String key, final String value) {