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 2014/03/20 11:07:21 UTC
[3/3] git commit: CAMEL-7308: Timer consumer should defer schedluing
during Camel startup to after when Camel has started using the startup
listener,
like other component does like quartz etc. Thanks to Metatech for the patch.
CAMEL-7308: Timer consumer should defer schedluing during Camel startup to after when Camel has started using the startup listener, like other component does like quartz etc. Thanks to Metatech for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e7975d77
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e7975d77
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e7975d77
Branch: refs/heads/camel-2.12.x
Commit: e7975d77dc97bac009c5051bf2e012d6afeeec24
Parents: 8a5fe8e
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 20 11:09:03 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 20 11:10:06 2014 +0100
----------------------------------------------------------------------
.../camel/component/timer/TimerConsumer.java | 24 +++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e7975d77/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java b/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
index d6f7254..66617d2 100644
--- a/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
@@ -22,8 +22,10 @@ import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.camel.AsyncCallback;
+import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.StartupListener;
import org.apache.camel.impl.DefaultConsumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,10 +35,11 @@ import org.slf4j.LoggerFactory;
*
* @version
*/
-public class TimerConsumer extends DefaultConsumer {
+public class TimerConsumer extends DefaultConsumer implements StartupListener {
private static final Logger LOG = LoggerFactory.getLogger(TimerConsumer.class);
private final TimerEndpoint endpoint;
private volatile TimerTask task;
+ private volatile boolean configured;
public TimerConsumer(TimerEndpoint endpoint, Processor processor) {
super(endpoint, processor);
@@ -53,6 +56,7 @@ public class TimerConsumer extends DefaultConsumer {
public void run() {
if (!isTaskRunAllowed()) {
// do not run timer task as it was not allowed
+ LOG.debug("Run now allowed for timer: {}", endpoint);
return;
}
@@ -74,8 +78,12 @@ public class TimerConsumer extends DefaultConsumer {
}
};
- Timer timer = endpoint.getTimer();
- configureTask(task, timer);
+ // only configure task if CamelContext already started, otherwise the StartupListener
+ // is configuring the task later
+ if (!configured && endpoint.getCamelContext().getStatus().isStarted()) {
+ Timer timer = endpoint.getTimer();
+ configureTask(task, timer);
+ }
}
@Override
@@ -84,6 +92,15 @@ public class TimerConsumer extends DefaultConsumer {
task.cancel();
}
task = null;
+ configured = false;
+ }
+
+ @Override
+ public void onCamelContextStarted(CamelContext context, boolean alreadyStarted) throws Exception {
+ if (task != null && !configured) {
+ Timer timer = endpoint.getTimer();
+ configureTask(task, timer);
+ }
}
/**
@@ -117,6 +134,7 @@ public class TimerConsumer extends DefaultConsumer {
}
}
}
+ configured = true;
}
protected void sendTimerExchange(long counter) {