From 40d9b504a9cc2593a19ab9c487eb5c873937ca75 Mon Sep 17 00:00:00 2001
From: Carter Kozak <ckozak@apache.org>
Date: Thu, 7 Jun 2018 08:49:36 -0400
Subject: [PATCH] Log4j 1.2 api tests do not leak MDC values.

---
 .../java/org/apache/log4j/LogWithMDCTest.java | 23 +++++++++++--------
 .../org/apache/log4j/LogWithRouteTest.java    | 23 +++++++++++--------
 2 files changed, 28 insertions(+), 18 deletions(-)

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 c48e35ece7a..997d74514cf 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");
+        }
     }
 }
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 06ad4e8090c..606e87b4ac1 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");
+        }
     }
 }