cherry pick #10523 (#10524)

2c4473ee · Kerwin · GitHub · 8edaa6a7 · 2c4473ee
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java ...pache/dolphinscheduler/service/quartz/cron/CronUtils.java +3 -3

未找到文件。
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java
@@ -127,7 +127,7 @@ public class CronUtils {

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

        while (Stopper.isRunning()) {
            startTime = cronExpression.getNextValidTimeAfter(startTime);
-            if (startTime.after(endTime) || startTime.equals(endTime)) {
+            if (startTime == null || startTime.after(endTime) || startTime.equals(endTime)) {
                break;
            }
            dateList.add(startTime);