Merge pull request #358 from zemian/issue-220-dailytimeint-trigger-en…

…dtime DailyTimeIntervalTrigger failed to set endingDailyAfterCount = 1 #220
quartz-scheduler · Feb 15, 2019 · 487d748 · 487d748
2 parents 4978029 + b938143
commit 487d748
Show file tree

Hide file tree

Showing 3 changed files with 278 additions and 262 deletions.
diff --git a/changelog.md b/changelog.md
@@ -10,6 +10,7 @@ THIS RELEASE REQUIRES JDK7
 * #212 bugfix: QuartzInitializerListener: fix a typo
 * #193 bugfix: Job execution context impl returns incorrect recovering job key
 * #172 bugfix: Miss notify SchedulerListeners in QuartzScheduler.java
+* #220 bugifx: DailyTimeIntervalTrigger failed to set endingDailyAfterCount = 1
 * #160 improv: Add drop table if exists check in sql script for postgres
 * #214 improv: Reuse JobBuilder.storeDurably(boolean) in JobBuilder
 * #281 improv: Fix no setter for dataSource property validateOnCheckout

diff --git a/quartz-core/src/main/java/org/quartz/impl/triggers/DailyTimeIntervalTriggerImpl.java b/quartz-core/src/main/java/org/quartz/impl/triggers/DailyTimeIntervalTriggerImpl.java
@@ -854,8 +854,13 @@ public void validate() throws SchedulerException {
         }        
 
         // Ensure timeOfDay is in order.
-        if (getEndTimeOfDay() != null && !getStartTimeOfDay().before(getEndTimeOfDay())) {
-            throw new SchedulerException("StartTimeOfDay " + startTimeOfDay + " should not come after endTimeOfDay " + endTimeOfDay);
+        // NOTE: We allow startTimeOfDay to be set equal to endTimeOfDay so the repeatCount can be
+        // set to 1.
+        if (getEndTimeOfDay() != null
+            && !getStartTimeOfDay().equals(getEndTimeOfDay())
+            && !getStartTimeOfDay().before(getEndTimeOfDay())) {
+            throw new SchedulerException("StartTimeOfDay " + startTimeOfDay
+                + " should not come after endTimeOfDay " + endTimeOfDay);
         }
     }