From da90f46e432faf764443d1e5ce77fd8099c6ff33 Mon Sep 17 00:00:00 2001
From: hengyunabc <hengyunabc@gmail.com>
Date: Sun, 24 May 2020 16:54:17 +0800
Subject: [PATCH] polish 6322374d81d9e1374c65f5594cf784c37a459fe9

---
 .../system/impl/GlobalJobControllerImpl.java     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/com/taobao/arthas/core/shell/system/impl/GlobalJobControllerImpl.java b/core/src/main/java/com/taobao/arthas/core/shell/system/impl/GlobalJobControllerImpl.java
index 938f4e4f2..8fe83ae56 100644
--- a/core/src/main/java/com/taobao/arthas/core/shell/system/impl/GlobalJobControllerImpl.java
+++ b/core/src/main/java/com/taobao/arthas/core/shell/system/impl/GlobalJobControllerImpl.java
@@ -108,10 +108,18 @@ public class GlobalJobControllerImpl extends JobControllerImpl {
 
         @Override
         public void run() {
-            if (job != null) {
-                Job temp = job;
-                job = null;
-                temp.terminate();
+            try {
+                if (job != null) {
+                    Job temp = job;
+                    job = null;
+                    temp.terminate();
+                }
+            } catch (Throwable e) {
+                try {
+                    logger.error("JobTimeoutTask error, job id: {}, line: {}", job.id(), job.line(), e);
+                } catch (Throwable t) {
+                    // ignore
+                }
             }
         }