CloseableThreadContext where applicable

Author: NicoPiel

donkey/src/main/java/com/mirth/connect/donkey/server/channel/Channel.java

@@ -38,6 +38,7 @@
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.logging.log4j.CloseableThreadContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.ThreadContext;
@@ -1258,7 +1259,10 @@ protected DispatchResult dispatchRawMessage(RawMessage rawMessage, boolean batch
         boolean lockAcquired = false;
         Long persistedMessageId = null;
 
-        try {
+        try (CloseableThreadContext.Instance ctc = CloseableThreadContext
+                .put("channelId", channelId)
+                .put("channelName", name)
+        ) {
             synchronized (dispatchThreads) {
                 if (!shuttingDown) {
                     dispatchThreads.add(currentThread);
@@ -1272,9 +1276,6 @@ protected DispatchResult dispatchRawMessage(RawMessage rawMessage, boolean batch
             } else {
                 currentThread.setName("Channel Dispatch Thread on " + name + " (" + channelId + ") < " + originalThreadName);
             }
-            
-            ThreadContext.put("channelId", channelId);
-            ThreadContext.put("channelName", name);
 
             DonkeyDao dao = null;
             boolean commitSuccess = false;
@@ -1390,8 +1391,6 @@ protected DispatchResult dispatchRawMessage(RawMessage rawMessage, boolean batch
                 dispatchThreads.remove(currentThread);
             }
             currentThread.setName(originalThreadName);
-            ThreadContext.remove("channelId");
-            ThreadContext.remove("channelName");
         }
     }
 
@@ -1939,17 +1938,15 @@ public void processUnfinishedMessages() throws Exception {
 
     @Override
     public void run() {
-        try {
-            ThreadContext.put("channelId", channelId);
-            ThreadContext.put("channelName", name);
+        try (CloseableThreadContext.Instance ctc = CloseableThreadContext
+                .put("channelId", channelId)
+                .put("channelName", name)
+        ) {
             do {
                 processSourceQueue(Constants.SOURCE_QUEUE_POLL_TIMEOUT_MILLIS);
             } while (isActive() && !stopSourceQueue);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
-        } finally {
-            ThreadContext.remove("channelId");
-            ThreadContext.remove("channelName");
         }
     }
 

donkey/src/main/java/com/mirth/connect/donkey/server/channel/DestinationChain.java

@@ -16,6 +16,7 @@
 import java.util.concurrent.Callable;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.CloseableThreadContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.ThreadContext;
@@ -64,18 +65,18 @@ public List<ConnectorMessage> call() throws InterruptedException {
             Thread.currentThread().setName(name + " < " + originalThreadName);
             String channelId = chainProvider.getChannelId();
             String channelName = null;
+
             if (!chainProvider.getDestinationConnectors().isEmpty()) {
                 channelName = chainProvider.getDestinationConnectors().values().iterator().next().getChannel().getName();
             }
 
-            ThreadContext.put("channelId", channelId);
-            if (channelName != null) {
-                ThreadContext.put("channelName", channelName);
+            try (CloseableThreadContext.Instance ctc = CloseableThreadContext
+                    .put("channelId", channelId)
+                    .put("channelName", channelName != null ? channelName : "")
+            ) {
+                return doCall();
             }
-            return doCall();
         } finally {
-            ThreadContext.remove("channelId");
-            ThreadContext.remove("channelName");
             Thread.currentThread().setName(originalThreadName);
         }
     }