From 55d855a1ad1521209514d877e713b9bed04c204d Mon Sep 17 00:00:00 2001
From: Daniel Beck <daniel-beck@github.com>
Date: Fri, 18 Apr 2014 00:39:43 +0200
Subject: [PATCH] [FIXED JENKINS-22672] Make /threadDump easier to use.

---
 core/src/main/java/jenkins/model/Jenkins.java    |  3 ++-
 .../jenkins/model/Jenkins/threadDump.jelly       | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 5ec8026ab8..533a476130 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -279,6 +279,7 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
+import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
@@ -2954,7 +2955,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
                 r.put(e.getKey(), Collections.singletonMap("Failed to retrieve thread dump",sw.toString()));
             }
         }
-        return r;
+        return Collections.unmodifiableSortedMap(new TreeMap<String, Map<String, String>>(r));
     }
 
     public synchronized TopLevelItem doCreateItem( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
diff --git a/core/src/main/resources/jenkins/model/Jenkins/threadDump.jelly b/core/src/main/resources/jenkins/model/Jenkins/threadDump.jelly
index 50751eba36..52cf2105f0 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/threadDump.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/threadDump.jelly
@@ -32,11 +32,23 @@ THE SOFTWARE.
 
     <l:main-panel>
       <h1>${%Thread Dump}</h1>
-      <j:forEach var="e" items="${it.getAllThreadDumps().entrySet()}" varStatus="loop">
+      <j:set var="tdumps" value="${it.getAllThreadDumps()}"/>
+
+      <j:forEach var="e" items="${tdumps.entrySet()}">
+        <j:if test="${e.key != null and e.key.length() > 0}">
+          <a href="#id${e.key.hashCode()}"><img src="${imagesURL}/16x16/computer.png" style="margin-left:10px;" /> ${e.key}</a>
+        </j:if>
+      </j:forEach>
+
+      <j:forEach var="e" items="${tdumps.entrySet()}" varStatus="loop">
         <j:if test="${!loop.first}">
           <hr style="margin-bottom:6em"/>
         </j:if>
-        <h1>${e.key}</h1>
+        <j:if test="${e.key != null and e.key.length() > 0}">
+          <h1 id="id${e.key.hashCode()}">
+            <img src="${imagesURL}/32x32/computer.png"/> <a href="/computer/${e.key}" class="model-link inside">${e.key}</a>
+          </h1>
+        </j:if>
         <j:forEach var="t" items="${e.value.entrySet()}">
           <h2>${t.key}</h2>
           <pre>${t.value}</pre>
-- 
GitLab