CAMEL-6832: Fixed quartz to only add job counter if scheduling the job was succesful.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ec180d2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ec180d2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ec180d2 Branch: refs/heads/camel-2.11.x Commit: 2ec180d2acb7fc7f7530162a6f8d6b4dd0d1d9b9 Parents: c9e4b1e Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Oct 12 12:17:22 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Oct 12 12:17:46 2013 +0200 ---------------------------------------------------------------------- .../apache/camel/component/quartz/QuartzComponent.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2ec180d2/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java index af7a22d..2372a4b 100644 --- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java +++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java @@ -227,8 +227,6 @@ public class QuartzComponent extends DefaultComponent implements StartupListener } private void doAddJob(JobDetail job, Trigger trigger) throws SchedulerException { - incrementJobCounter(getScheduler()); - Trigger existingTrigger = getScheduler().getTrigger(trigger.getName(), trigger.getGroup()); if (existingTrigger == null) { LOG.debug("Adding job using trigger: {}/{}", trigger.getGroup(), trigger.getName()); @@ -260,6 +258,9 @@ public class QuartzComponent extends DefaultComponent implements StartupListener LOG.debug("Trigger: {}/{} already exists and is already scheduled by clustered JobStore.", trigger.getGroup(), trigger.getName()); } } + + // only increment job counter if we are successful + incrementJobCounter(getScheduler()); } private boolean hasTriggerChanged(Trigger oldTrigger, Trigger newTrigger) { @@ -273,8 +274,6 @@ public class QuartzComponent extends DefaultComponent implements StartupListener } public void pauseJob(Trigger trigger) throws SchedulerException { - decrementJobCounter(getScheduler()); - if (isClustered()) { // do not pause jobs which are clustered, as we want the jobs to continue running on the other nodes LOG.debug("Cannot pause job using trigger: {}/{} as the JobStore is clustered.", trigger.getGroup(), trigger.getName()); @@ -283,6 +282,9 @@ public class QuartzComponent extends DefaultComponent implements StartupListener getScheduler().pauseTrigger(trigger.getName(), trigger.getGroup()); getScheduler().pauseJob(trigger.getName(), trigger.getGroup()); } + + // only decrement job counter if we are successful + decrementJobCounter(getScheduler()); } public void deleteJob(String name, String group) throws SchedulerException {
