Repository: logging-log4j2 Updated Branches: refs/heads/master 615fc0fcd -> 40d9b504a
Log4j 1.2 api tests do not leak MDC values. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/40d9b504 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/40d9b504 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/40d9b504 Branch: refs/heads/master Commit: 40d9b504a9cc2593a19ab9c487eb5c873937ca75 Parents: 615fc0f Author: Carter Kozak <[email protected]> Authored: Thu Jun 7 08:49:36 2018 -0400 Committer: Carter Kozak <[email protected]> Committed: Thu Jun 7 10:18:20 2018 -0400 ---------------------------------------------------------------------- .../java/org/apache/log4j/LogWithMDCTest.java | 23 ++++++++++++-------- .../java/org/apache/log4j/LogWithRouteTest.java | 23 ++++++++++++-------- 2 files changed, 28 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/40d9b504/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java index c48e35e..997d745 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java @@ -39,14 +39,19 @@ public class LogWithMDCTest { public void testMDC() throws Exception { MDC.put("Key1", "John"); MDC.put("Key2", "Smith"); - final Logger logger = Logger.getLogger("org.apache.test.logging"); - logger.debug("This is a test"); - final ListAppender listApp = (ListAppender) CTX.getAppender("List"); - assertNotNull(listApp); - final List<String> msgs = listApp.getMessages(); - assertNotNull("No messages received", msgs); - assertTrue(msgs.size() == 1); - assertTrue("Key1 is missing", msgs.get(0).contains("Key1=John")); - assertTrue("Key2 is missing", msgs.get(0).contains("Key2=Smith")); + try { + final Logger logger = Logger.getLogger("org.apache.test.logging"); + logger.debug("This is a test"); + final ListAppender listApp = (ListAppender) CTX.getAppender("List"); + assertNotNull(listApp); + final List<String> msgs = listApp.getMessages(); + assertNotNull("No messages received", msgs); + assertTrue(msgs.size() == 1); + assertTrue("Key1 is missing", msgs.get(0).contains("Key1=John")); + assertTrue("Key2 is missing", msgs.get(0).contains("Key2=Smith")); + } finally { + MDC.remove("Key1"); + MDC.remove("Key2"); + } } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/40d9b504/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java index 06ad4e8..606e87b 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java @@ -40,14 +40,19 @@ public class LogWithRouteTest { public void testMDC() throws Exception { MDC.put("Type", "Service"); MDC.put("Name", "John Smith"); - final Logger logger = Logger.getLogger("org.apache.test.logging"); - logger.debug("This is a test"); - final ListAppender listApp = (ListAppender) CTX.getAppender("List"); - assertNotNull(listApp); - final List<String> msgs = listApp.getMessages(); - assertNotNull("No messages received", msgs); - assertTrue(msgs.size() == 1); - assertTrue("Type is missing", msgs.get(0).contains("Type=Service")); - assertTrue("Name is missing", msgs.get(0).contains("Name=John Smith")); + try { + final Logger logger = Logger.getLogger("org.apache.test.logging"); + logger.debug("This is a test"); + final ListAppender listApp = (ListAppender) CTX.getAppender("List"); + assertNotNull(listApp); + final List<String> msgs = listApp.getMessages(); + assertNotNull("No messages received", msgs); + assertTrue(msgs.size() == 1); + assertTrue("Type is missing", msgs.get(0).contains("Type=Service")); + assertTrue("Name is missing", msgs.get(0).contains("Name=John Smith")); + } finally { + MDC.remove("Type"); + MDC.remove("Name"); + } } }
