diff --git a/slf4j-api/src/main/java/org/slf4j/MDC.java b/slf4j-api/src/main/java/org/slf4j/MDC.java index 4b3df2810..f5a2ea0ea 100644 --- a/slf4j-api/src/main/java/org/slf4j/MDC.java +++ b/slf4j-api/src/main/java/org/slf4j/MDC.java @@ -70,7 +70,7 @@ public class MDC { /** * An adapter to remove the key when done. */ - private static class MDCCloseable implements Closeable { + public static class MDCCloseable implements Closeable { private final String key; private MDCCloseable(String key) { @@ -147,7 +147,7 @@ public static void put(String key, String val) *
* Useful with Java 7 for example :
*
- * try(Closeable closeable = MDC.putCloseable(key, value)) {
+ * try(MDC.MDCCloseable closeable = MDC.putCloseable(key, value)) {
* ....
* }
*
@@ -160,7 +160,7 @@ public static void put(String key, String val)
* @throws IllegalArgumentException
* in case the "key" parameter is null
*/
- public static Closeable putCloseable(String key, String val)
+ public static MDCCloseable putCloseable(String key, String val)
throws IllegalArgumentException {
put(key, val);
return new MDCCloseable(key);
diff --git a/slf4j-nop/src/test/java/org/slf4j/InvocationTest.java b/slf4j-nop/src/test/java/org/slf4j/InvocationTest.java
index 2bfae5a51..2828124fc 100644
--- a/slf4j-nop/src/test/java/org/slf4j/InvocationTest.java
+++ b/slf4j-nop/src/test/java/org/slf4j/InvocationTest.java
@@ -120,8 +120,8 @@ public void testMDC() {
MDC.clear();
}
- public void testMDCCloseable() throws IOException {
- Closeable closeable = MDC.putCloseable("k", "v");
+ public void testMDCCloseable() {
+ MDC.MDCCloseable closeable = MDC.putCloseable("k", "v");
assertNull(MDC.get("k"));
closeable.close();
assertNull(MDC.get("k"));