From 73b6484dc98b217538ba2ae862bf27b711c67161 Mon Sep 17 00:00:00 2001 From: "xueli.xue" Date: Sat, 23 Jul 2016 19:46:52 +0800 Subject: [PATCH] coding --- .../src/main/java/com/xxl/job/core/router/HandlerRouter.java | 3 ++- .../main/java/com/xxl/job/core/router/action/RunAction.java | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/router/HandlerRouter.java b/xxl-job-core/src/main/java/com/xxl/job/core/router/HandlerRouter.java index 95057249..4fd62a42 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/router/HandlerRouter.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/router/HandlerRouter.java @@ -40,7 +40,8 @@ public class HandlerRouter { JobThread jobThread = new JobThread(handler); jobThread.start(); logger.info(">>>>>>>>>>> xxl-job regist JobThread success, jobkey:{}, handler:{}", new Object[]{jobkey, handler}); - return HandlerRouter.JobThreadRepository.put(jobkey, jobThread); // putIfAbsent + HandlerRouter.JobThreadRepository.put(jobkey, jobThread); // putIfAbsent | oh my god, map's put method return the old value!!! + return jobThread; } public static JobThread loadJobThread(String jobKey){ return HandlerRouter.JobThreadRepository.get(jobKey); diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/router/action/RunAction.java b/xxl-job-core/src/main/java/com/xxl/job/core/router/action/RunAction.java index 93d5b374..cd052db7 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/router/action/RunAction.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/router/action/RunAction.java @@ -61,11 +61,6 @@ public class RunAction extends IAction { } } - // sometime, cmap.get can not return given value, i do not know why - if (jobThread == null) { - jobThread = HandlerRouter.loadJobThread(jobKey); - } - // push data to queue jobThread.pushTriggerQueue(requestModel); return new ResponseModel(ResponseModel.SUCCESS, null); -- GitLab