natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cherry pick #10523 (#10524)

This commit is contained in:
Kerwin 2022-06-22 09:09:20 +08:00 committed by GitHub
parent 8edaa6a7de
commit 2c4473ee43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java
View File

@ -127,7 +127,7 @@ public class CronUtils {
while (Stopper.isRunning()) { while (Stopper.isRunning()) {
startTime = cronExpression.getNextValidTimeAfter(startTime); startTime = cronExpression.getNextValidTimeAfter(startTime);
if (startTime.after(endTime)) { if (startTime == null || startTime.after(endTime)) {
break; break;
} }
dateList.add(startTime); dateList.add(startTime);
@ -149,7 +149,7 @@ public class CronUtils {
List<Date> dateList = new ArrayList<>(); List<Date> dateList = new ArrayList<>();
while (fireTimes > 0) { while (fireTimes > 0) {
startTime = cronExpression.getNextValidTimeAfter(startTime); startTime = cronExpression.getNextValidTimeAfter(startTime);
if (startTime.after(endTime) || startTime.equals(endTime)) { if (startTime == null || startTime.after(endTime) || startTime.equals(endTime)) {
break; break;
} }
dateList.add(startTime); dateList.add(startTime);
@ -172,7 +172,7 @@ public class CronUtils {
while (Stopper.isRunning()) { while (Stopper.isRunning()) {
startTime = cronExpression.getNextValidTimeAfter(startTime); startTime = cronExpression.getNextValidTimeAfter(startTime);
if (startTime.after(endTime) || startTime.equals(endTime)) { if (startTime == null || startTime.after(endTime) || startTime.equals(endTime)) {
break; break;
} }
dateList.add(startTime); dateList.add(startTime);