Merge branch 'master' of https://github.com/xuxueli/xxl-job

xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java

@@ -92,6 +92,12 @@ public class XxlJobExecutor  {
             }
             }
             jobThreadRepository.clear();
             jobThreadRepository.clear();
         }
         }
+        if(jobHandlerRepository.size() >0 ){
+            for (Map.Entry<String, IJobHandler> item: jobHandlerRepository.entrySet()){
+                removeJobHandler(item.getKey(), "web container destroy and kill the jod handler");
+            }
+            jobHandlerRepository.clear();
+        }
 
 
 
 
         // destory JobLogFileCleanThread
         // destory JobLogFileCleanThread
@@ -104,6 +110,13 @@ public class XxlJobExecutor  {
         stopRpcProvider();
         stopRpcProvider();
     }
     }
 
 
+    private void removeJobHandler(String handlerId, String removeOldReason){
+        IJobHandler oldJobHandler = jobHandlerRepository.remove(handlerId);
+        if (oldJobHandler != null) {
+            oldJobHandler.destroy();
+        }
+    }
+
 
 
     // ---------------------- admin-client (rpc invoker) ----------------------
     // ---------------------- admin-client (rpc invoker) ----------------------
     private static List<AdminBiz> adminBizList;
     private static List<AdminBiz> adminBizList;