Polishing #213

Add author tags. Move currentThread lookup to caching section. Original pull request: #214.
mp911de · Dec 3, 2019 · 6533e5c · 6533e5c
1 parent 71bb0da
commit 6533e5c
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/src/main/java/biz/paluch/logging/gelf/jul/JulLogEvent.java b/src/main/java/biz/paluch/logging/gelf/jul/JulLogEvent.java
@@ -1,8 +1,5 @@
 package biz.paluch.logging.gelf.jul;
 
-import java.lang.management.ManagementFactory;
-import java.lang.management.ThreadInfo;
-import java.lang.management.ThreadMXBean;
 import java.text.MessageFormat;
 import java.util.Collections;
 import java.util.IllegalFormatException;
@@ -17,6 +14,7 @@
 
 /**
  * @author Mark Paluch
+ * @author Loïc Mathieu
  * @since 26.09.13 15:22
  */
 public class JulLogEvent implements LogEvent {
@@ -96,22 +94,25 @@ private String createMessage(LogRecord record) {
     }
 
     private String getThreadName(LogRecord record) {
-        if (record.getThreadID() == Thread.currentThread().getId()) {
-            return Thread.currentThread().getName();
-        }
 
         String cacheKey = "" + record.getThreadID();
         if (threadNameCache.containsKey(cacheKey)) {
             return threadNameCache.get(cacheKey);
         }
 
         long threadId = record.getThreadID();
-        String threadName = "" + record.getThreadID();
-        Set<Thread> threadSet = Thread.getAllStackTraces().keySet();
-        for (Thread thread : threadSet) {
-            if (thread.getId() == threadId) {
-                threadName = thread.getName();
-                break;
+        String threadName = cacheKey;
+
+        Thread currentThread = Thread.currentThread();
+        if (record.getThreadID() == currentThread.getId()) {
+            threadName = currentThread.getName();
+        } else {
+            Set<Thread> threadSet = Thread.getAllStackTraces().keySet();
+            for (Thread thread : threadSet) {
+                if (thread.getId() == threadId) {
+                    threadName = thread.getName();
+                    break;
+                }
             }
         }