From beb6b4f2bb3924f8d355ab7a507bcc5415b428d3 Mon Sep 17 00:00:00 2001 From: "fabio.formosa" Date: Fri, 21 Jul 2017 17:11:48 +0200 Subject: [PATCH] fixed bug about the update of prev fire time and next fire time --- .../quartzmanager/aspects/ProgressUpdaterImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/aspects/ProgressUpdaterImpl.java b/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/aspects/ProgressUpdaterImpl.java index e7e7c73..791d444 100644 --- a/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/aspects/ProgressUpdaterImpl.java +++ b/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/aspects/ProgressUpdaterImpl.java @@ -35,7 +35,12 @@ public class ProgressUpdaterImpl implements ProgressUpdater { @Override public void update() throws SchedulerException { + TriggerProgress progress = new TriggerProgress(); + Trigger trigger = scheduler.getTrigger(triggerMonitor.getTrigger().getKey()); + progress.setFinalFireTime(trigger.getFinalFireTime()); + progress.setNextFireTime(trigger.getNextFireTime()); + progress.setPreviousFireTime(trigger.getPreviousFireTime()); int timesTriggered = 0; int repeatCount = 0; @@ -50,16 +55,12 @@ public class ProgressUpdaterImpl implements ProgressUpdater { repeatCount = dailyTrigger.getRepeatCount(); } - TriggerProgress progress = new TriggerProgress(); Trigger jobTrigger = triggerMonitor.getTrigger(); if (jobTrigger != null && jobTrigger.getJobKey() != null) { progress.setJobKey(jobTrigger.getJobKey().getName()); progress.setJobClass(jobTrigger.getClass().getSimpleName()); progress.setTimesTriggered(timesTriggered); progress.setRepeatCount(repeatCount + 1); - progress.setFinalFireTime(jobTrigger.getFinalFireTime()); - progress.setNextFireTime(jobTrigger.getNextFireTime()); - progress.setPreviousFireTime(jobTrigger.getPreviousFireTime()); } messagingTemplate.convertAndSend("/topic/progress", progress);