diff --git a/pom.xml b/pom.xml index 596c1f7a..1c0c19da 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ log4j log4j - 1.2.13 + 1.2.14 diff --git a/slf4j-api/src/main/java/org/slf4j/MDC.java b/slf4j-api/src/main/java/org/slf4j/MDC.java index 71cf2197..ae1bd841 100644 --- a/slf4j-api/src/main/java/org/slf4j/MDC.java +++ b/slf4j-api/src/main/java/org/slf4j/MDC.java @@ -168,12 +168,12 @@ public class MDC { * @return A copy of the current thread's context map. May be null. * @since 1.5.1 */ - public static Map getCopyOfPropertyMap() { + public static Map getCopyOfContextMap() { if (mdcAdapter == null) { throw new IllegalStateException("MDCAdapter cannot be null. See also " + NULL_MDCA_URL); } - return mdcAdapter.getCopyOfPropertyMap(); + return mdcAdapter.getCopyOfContextMap(); } /** diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java index f31f8686..83df376a 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java @@ -122,7 +122,7 @@ public class BasicMDCAdapter implements MDCAdapter { * Returned value may be null. * */ - public Map getCopyOfPropertyMap() { + public Map getCopyOfContextMap() { HashMap hashMap = (HashMap) inheritableThreadLocal.get(); if (hashMap != null) { return new HashMap(hashMap); diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/NOPMakerAdapter.java b/slf4j-api/src/main/java/org/slf4j/helpers/NOPMakerAdapter.java index 3325f9ce..fca3b614 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/NOPMakerAdapter.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/NOPMakerAdapter.java @@ -28,7 +28,7 @@ public class NOPMakerAdapter implements MDCAdapter { public void remove(String key) { } - public Map getCopyOfPropertyMap() { + public Map getCopyOfContextMap() { return null; } diff --git a/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java b/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java index 267252d9..413f0851 100644 --- a/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java +++ b/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java @@ -76,5 +76,5 @@ public interface MDCAdapter { * @return A copy of the current thread's context map. May be null. * @since 1.5.1 */ - public Map getCopyOfPropertyMap(); + public Map getCopyOfContextMap(); } diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java index fbd4d0d6..76fe12d5 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java @@ -38,7 +38,7 @@ public class Log4jMDCAdapter implements MDCAdapter { org.apache.log4j.MDC.remove(key); } - public Map getCopyOfPropertyMap() { + public Map getCopyOfContextMap() { Map old = org.apache.log4j.MDC.getContext(); if(old != null) { return new HashMap(old); diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index e2be2d44..00f971b9 100644 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -41,8 +41,23 @@ prefix=''; Log4jLoggerAdapter will map the TRACE level as DEBUG.

-

The SLF4J Migrator tool has been - improved to support migration from JUL to SLF4J. + +

Added the getCopyOfContextMap method to the + MDCAdapter and org.sf4j.MDC classes. This + was requested in bug 84 by + Anton Tagunov. +

+ +

Added the getEffectiveLevel() method to the + Category class in log4j-over-slf4j. This addition was + requested in bug 74 by + Michael Newcomb. +

+ +

The SLF4J Migrator + tool has been improved to support migration from JUL to SLF4J.

In MarkerIgnoringBase class, corrected mapping of