Author: davsclaus
Date: Wed Jan 18 08:20:40 2012
New Revision: 1232784
URL: http://svn.apache.org/viewvc?rev=1232784&view=rev
Log:
CAMEL-4911: SedaConsumer should not poll if CamelContext is starting.
Added:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddFromRouteTest.java
- copied unchanged from r1232782,
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddFromRouteTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
camel/branches/camel-2.9.x/components/camel-http/ (props changed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 18 08:20:40 2012
@@ -1 +1 @@
-/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763
+/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 18 08:20:40 2012
@@ -1 +1 @@
-/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763
+/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java?rev=1232784&r1=1232783&r2=1232784&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
Wed Jan 18 08:20:40 2012
@@ -138,6 +138,18 @@ public class SedaConsumer extends Servic
BlockingQueue<Exchange> queue = endpoint.getQueue();
// loop while we are allowed, or if we are stopping loop until the
queue is empty
while (queue != null && (isRunAllowed())) {
+
+ // do not poll during CamelContext is starting, as we should only
poll when CamelContext is fully started
+ if (getEndpoint().getCamelContext().getStatus().isStarting()) {
+ LOG.trace("CamelContext is starting so skip polling");
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ LOG.debug("Sleep interrupted, are we stopping? {}",
isStopping() || isStopped());
+ }
+ continue;
+ }
+
// do not poll if we are suspended
if (isSuspending() || isSuspended()) {
LOG.trace("Consumer is suspended so skip polling");
Propchange: camel/branches/camel-2.9.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 18 08:20:40 2012
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1227209,1227212,1228015,1228027,1228223,1228879
+/camel/trunk/components/camel-http:917526,1227209,1227212,1228015,1228027,1228223,1228879,1232782
