diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/constant/Const.java b/xxl-job-core/src/main/java/com/xxl/job/core/constant/Const.java
index 0878fd90..45cf27cc 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/constant/Const.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/constant/Const.java
@@ -25,4 +25,12 @@ public class Const {
      */
     public static final int DEAD_TIMEOUT = BEAT_TIMEOUT * 3;
 
+
+    // ---------------------- for executor ----------------------
+
+    /*
+     * elegant shutdown wait seconds
+     */
+    public static final long ELEGANT_SHUTDOWN_WAITING_SECONDS = 5;
+
 }
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java b/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java
index 3f2dfc81..1c86bdf6 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java
@@ -138,7 +138,7 @@ public class XxlJobContext {
     /**
      * xxl-job context store
      */
-    private static final InheritableThreadLocal<XxlJobContext> contextHolder = new InheritableThreadLocal<XxlJobContext>(); // support for child thread of job handler)
+    private static final InheritableThreadLocal<XxlJobContext> contextHolder = new InheritableThreadLocal<>(); // support for child thread of job handler)
 
     /**
      * set xxl-job context