camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [4/6] camel git commit: CAMEL-8770 Fixed the depends-on issue of Camel Blueprint
Date Wed, 13 May 2015 07:22:24 GMT
CAMEL-8770 Fixed the depends-on issue of Camel Blueprint


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd701e04
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd701e04
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd701e04

Branch: refs/heads/camel-2.15.x
Commit: bd701e048650ffdf155b12d3febc4441119b6866
Parents: 21107ff
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Wed May 13 14:37:38 2015 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Wed May 13 15:13:48 2015 +0800

----------------------------------------------------------------------
 .../apache/camel/blueprint/handler/CamelNamespaceHandler.java    | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/bd701e04/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index cd44d85..474d130 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -259,6 +259,10 @@ public class CamelNamespaceHandler implements NamespaceHandler {
         factory2.addProperty("blueprintContainer", createRef(context, "blueprintContainer"));
         factory2.addProperty("bundleContext", createRef(context, "blueprintBundleContext"));
         factory2.addDependsOn(propertiesComponentResolver.getId());
+        // We need to add other components which the camel context dependsOn
+        if (ObjectHelper.isNotEmpty(ccfb.getDependsOn())) {
+            factory2.addDependsOn(ccfb.getDependsOn());
+        }
         context.getComponentDefinitionRegistry().registerComponentDefinition(factory2);
 
         MutableBeanMetadata ctx = context.createMetadata(MutableBeanMetadata.class);


Mime
View raw message