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 2017/03/27 13:23:08 UTC
[2/4] camel git commit: CAMEL-7809: Fixed test. This closes #1577.
CAMEL-7809: Fixed test. This closes #1577.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2301422d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2301422d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2301422d
Branch: refs/heads/camel-2.18.x
Commit: 2301422d06c6bbb144e0a6913d2877892ad4428d
Parents: 6e875c9
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Mar 27 15:11:23 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 27 15:11:23 2017 +0200
----------------------------------------------------------------------
.../quartz2/QuartzScheduledPollConsumerScheduler.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2301422d/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java b/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
index 436683a..5192a56 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
+++ b/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
@@ -167,8 +167,13 @@ public class QuartzScheduledPollConsumerScheduler extends ServiceSupport impleme
if (id == null) {
id = "trigger-" + getCamelContext().getUuidGenerator().generateUuid();
}
- TriggerKey triggerKey = new TriggerKey(triggerId, triggerGroup);
- Trigger existingTrigger = quartzScheduler.getTrigger(triggerKey);
+
+ Trigger existingTrigger = null;
+ TriggerKey triggerKey = null;
+ if (triggerId != null && triggerGroup != null) {
+ triggerKey = new TriggerKey(triggerId, triggerGroup);
+ existingTrigger = quartzScheduler.getTrigger(triggerKey);
+ }
// Is an trigger already exist for this triggerId ?
if (existingTrigger == null) {
@@ -206,7 +211,6 @@ public class QuartzScheduledPollConsumerScheduler extends ServiceSupport impleme
quartzScheduler.rescheduleJob(triggerKey, existingTrigger);
}
-
}
@Override
@@ -225,7 +229,7 @@ public class QuartzScheduledPollConsumerScheduler extends ServiceSupport impleme
JobDataMap jobDataMap = trigger.getJobDataMap();
String routeIdFromTrigger = jobDataMap.getString("routeId");
if (routeIdFromTrigger != null && !routeIdFromTrigger.equals(routeId)) {
- throw new IllegalArgumentException("Trigger key " + trigger.getKey() + " is already used by route" + routeIdFromTrigger + ". Can't re-use it for route " + routeId);
+ throw new IllegalArgumentException("Trigger key " + trigger.getKey() + " is already used by route: " + routeIdFromTrigger + ". Cannot re-use it for another route: " + routeId);
}
}