You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/05/13 09:07:42 UTC

[3/3] camel git commit: CAMEL-8770 Fixed the depends-on issue of Camel Blueprint

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/9facd03a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9facd03a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9facd03a

Branch: refs/heads/master
Commit: 9facd03a3a92697a1023047fef05e45b48672fbf
Parents: 746e426
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed May 13 14:37:38 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed May 13 15:06:51 2015 +0800

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


http://git-wip-us.apache.org/repos/asf/camel/blob/9facd03a/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 475c057..393004a 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);