github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

cherry pick #10523 (#10524)

3.0.0/version-upgrade
Kerwin 2 years ago 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
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java

6
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java
Unescape 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);

Write Preview
Loading…
Cancel
Save