Explorar el Código

Merge pull request #371 from lusong1986/delet-cron-job-bug

cron表达式是null的字符串,修复bug    ---卢松
醉枫 hace 7 años
padre
commit
25bb0ac1e4

+ 1 - 1
lts-admin/src/main/java/com/github/ltsopensource/admin/web/api/JobQueueApi.java

@@ -166,7 +166,7 @@ public class JobQueueApi extends AbstractMVC {
 
         boolean success = appContext.getExecutableJobQueue().remove(request.getTaskTrackerNodeGroup(), request.getJobId());
         if (success) {
-            if (StringUtils.isNotEmpty(request.getCronExpression())) {
+            if (StringUtils.isNotEmpty(request.getCronExpression()) && !"null".equals(request.getCronExpression())) {
                 // 是Cron任务, Cron任务队列的也要被删除
                 try {
                     appContext.getCronJobQueue().remove(request.getJobId());