You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/10/12 12:18:46 UTC
[1/4] git commit: CAMEL-6832: Fixed quartz to only add job counter if
scheduling the job was succesful.
Updated Branches:
refs/heads/camel-2.10.x 92bf4255a -> 013e4058c
refs/heads/camel-2.11.x c9e4b1e10 -> 2ec180d2a
refs/heads/camel-2.12.x 4362bbb05 -> bc71c5537
refs/heads/master ad95bb9f1 -> 6cfa71484
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/6cfa7148
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6cfa7148
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6cfa7148
Branch: refs/heads/master
Commit: 6cfa71484e3a74c522b0da65ff5a167d94600aac
Parents: ad95bb9
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Oct 12 12:17:22 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Oct 12 12:17:22 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/6cfa7148/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 5c2a98e..0ea7a85 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 {
[4/4] git commit: CAMEL-6832: Fixed quartz to only add job counter if
scheduling the job was succesful.
Posted by da...@apache.org.
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/013e4058
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/013e4058
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/013e4058
Branch: refs/heads/camel-2.10.x
Commit: 013e4058c151fdfab39fe36508bacf0b9d69ab84
Parents: 92bf425
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Oct 12 12:17:22 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Oct 12 12:18:02 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/013e4058/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 5dcc34a..3db14d5 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
@@ -224,8 +224,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());
@@ -257,6 +255,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) {
@@ -270,8 +271,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());
@@ -280,6 +279,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 {
[2/4] git commit: CAMEL-6832: Fixed quartz to only add job counter if
scheduling the job was succesful.
Posted by da...@apache.org.
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/bc71c553
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc71c553
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc71c553
Branch: refs/heads/camel-2.12.x
Commit: bc71c55373d61662b82639e5c5d9431296ef788d
Parents: 4362bbb
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Oct 12 12:17:22 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Oct 12 12:17:35 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/bc71c553/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 5c2a98e..0ea7a85 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 {
[3/4] git commit: CAMEL-6832: Fixed quartz to only add job counter if
scheduling the job was succesful.
Posted by da...@apache.org.
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 <da...@apache.org>
Authored: Sat Oct 12 12:17:22 2013 +0200
Committer: Claus Ibsen <da...@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 {