Merge pull request #1 from k1th/bug/jlinn#68

fixing jlinn#68
k1th · Jul 25, 2022 · 0956c8e · 0956c8e
2 parents 894b448 + 4df6a20
commit 0956c8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/net/joelinn/quartz/jobstore/RedisClusterStorage.java b/src/main/java/net/joelinn/quartz/jobstore/RedisClusterStorage.java
@@ -660,7 +660,7 @@ public List<TriggerFiredResult> triggersFired(List<OperableTrigger> triggers, Je
             trigger.triggered(calendar);
 
             JobDetail job = retrieveJob(trigger.getJobKey(), jedis);
-            TriggerFiredBundle triggerFiredBundle = new TriggerFiredBundle(job, trigger, calendar, false, new Date(), previousFireTime, previousFireTime, trigger.getNextFireTime());
+            TriggerFiredBundle triggerFiredBundle = new TriggerFiredBundle(job, trigger, calendar, false, new Date(), trigger.getPreviousFireTime(), previousFireTime, trigger.getNextFireTime());
 
             // handling jobs for which concurrent execution is disallowed
             if (isJobConcurrentExecutionDisallowed(job.getJobClass())) {

diff --git a/src/main/java/net/joelinn/quartz/jobstore/RedisStorage.java b/src/main/java/net/joelinn/quartz/jobstore/RedisStorage.java
@@ -707,7 +707,7 @@ public List<TriggerFiredResult> triggersFired(List<OperableTrigger> triggers, Je
             }
 
             JobDetail job = retrieveJob(trigger.getJobKey(), jedis);
-            TriggerFiredBundle triggerFiredBundle = new TriggerFiredBundle(job, trigger, calendar, false, new Date(), previousFireTime, previousFireTime, nextFireDate);
+            TriggerFiredBundle triggerFiredBundle = new TriggerFiredBundle(job, trigger, calendar, false, new Date(), trigger.getPreviousFireTime(), previousFireTime, nextFireDate);
 
             // handling jobs for which concurrent execution is disallowed
             if (isJobConcurrentExecutionDisallowed(job.getJobClass())){