From eb7924a5c754e04566d6f64d57a2bc1910cac282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stig=20Rohde=20D=C3=B8ssing?= <srdo@apache.org>
Date: Wed, 1 Aug 2018 15:11:28 +0200
Subject: [PATCH] STORM-3166: Make Utils.threadDump account for threads dying
 before it can get the ThreadInfo

---
 storm-client/src/jvm/org/apache/storm/utils/Utils.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
index 8089c772bcf..559403905e1 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -1187,6 +1187,10 @@ public static String threadDump() {
         final java.lang.management.ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
         final java.lang.management.ThreadInfo[] threadInfos = threadMXBean.getThreadInfo(threadMXBean.getAllThreadIds(), 100);
         for (java.lang.management.ThreadInfo threadInfo : threadInfos) {
+            if (threadInfo == null) {
+                //Thread died before we could get the info, skip
+                continue;
+            }
             dump.append('"');
             dump.append(threadInfo.getThreadName());
             dump.append("\" ");