Repository: camel Updated Branches: refs/heads/camel-2.13.x a44fad581 -> 4bd45cbce
CAMEL-7387: MainSupport should not fail if no CamelContext found. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4bd45cbc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4bd45cbc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4bd45cbc Branch: refs/heads/camel-2.13.x Commit: 4bd45cbcea5512ae3d5a2f522170862374e27a39 Parents: a44fad5 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Apr 23 10:04:32 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Apr 23 10:30:41 2014 +0200 ---------------------------------------------------------------------- camel-core/src/main/java/org/apache/camel/main/Main.java | 10 ++++++++-- .../src/main/java/org/apache/camel/main/MainSupport.java | 4 ---- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4bd45cbc/camel-core/src/main/java/org/apache/camel/main/Main.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/main/Main.java b/camel-core/src/main/java/org/apache/camel/main/Main.java index 4cf17ce..85d516e 100644 --- a/camel-core/src/main/java/org/apache/camel/main/Main.java +++ b/camel-core/src/main/java/org/apache/camel/main/Main.java @@ -106,7 +106,9 @@ public class Main extends MainSupport { protected void doStart() throws Exception { super.doStart(); postProcessContext(); - getCamelContexts().get(0).start(); + if (getCamelContexts().size() > 0) { + getCamelContexts().get(0).start(); + } } protected void doStop() throws Exception { @@ -117,7 +119,11 @@ public class Main extends MainSupport { } protected ProducerTemplate findOrCreateCamelTemplate() { - return getCamelContexts().get(0).createProducerTemplate(); + if (getCamelContexts().size() > 0) { + return getCamelContexts().get(0).createProducerTemplate(); + } else { + return null; + } } protected Map<String, CamelContext> getCamelContextMap() { http://git-wip-us.apache.org/repos/asf/camel/blob/4bd45cbc/camel-core/src/main/java/org/apache/camel/main/MainSupport.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/main/MainSupport.java b/camel-core/src/main/java/org/apache/camel/main/MainSupport.java index 2a3498f..381f302 100644 --- a/camel-core/src/main/java/org/apache/camel/main/MainSupport.java +++ b/camel-core/src/main/java/org/apache/camel/main/MainSupport.java @@ -31,7 +31,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.xml.bind.JAXBException; import org.apache.camel.CamelContext; -import org.apache.camel.CamelException; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; @@ -393,9 +392,6 @@ public abstract class MainSupport extends ServiceSupport { protected void postProcessContext() throws Exception { Map<String, CamelContext> map = getCamelContextMap(); - if (map.size() == 0) { - throw new CamelException("Cannot find any Camel Context from the Application Context. Please check your Application Context setting"); - } Set<Map.Entry<String, CamelContext>> entries = map.entrySet(); int size = entries.size(); for (Map.Entry<String, CamelContext> entry : entries) {
