diff options
| author | Ceki Gulcu <ceki@qos.ch> | 2015-01-06 20:00:12 +0100 |
|---|---|---|
| committer | Ceki Gulcu <ceki@qos.ch> | 2015-01-06 20:00:12 +0100 |
| commit | ed80ded40128fe6268930abb9ab0437bd02a394b (patch) | |
| tree | b327a481816d1d7389bc45ac6e6c74b443fabc12 | |
| parent | 5396fdd962d44c89be9ded838d2c9804685f103b (diff) | |
| parent | 289795199d9b8db03897c5deeabc9b7343753b34 (diff) | |
| download | slf4j-ed80ded40128fe6268930abb9ab0437bd02a394b.tar.gz | |
Merge pull request #84 from twillouer/master
MDCCloseable instead of Closeable to avoid throwing of IOException
| -rw-r--r-- | slf4j-api/src/main/java/org/slf4j/MDC.java | 6 | ||||
| -rw-r--r-- | slf4j-nop/src/test/java/org/slf4j/InvocationTest.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/slf4j-api/src/main/java/org/slf4j/MDC.java b/slf4j-api/src/main/java/org/slf4j/MDC.java index 4b3df281..f5a2ea0e 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 class MDC { * <p> * Useful with Java 7 for example : * <code> - * try(Closeable closeable = MDC.putCloseable(key, value)) { + * try(MDC.MDCCloseable closeable = MDC.putCloseable(key, value)) { * .... * } * </code> @@ -160,7 +160,7 @@ public class MDC { * @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 2bfae5a5..2828124f 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 class InvocationTest extends TestCase { 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")); |