camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject [1/3] camel git commit: CAMEL-9526 - allow depends-on to contain multiple bean ids
Date Wed, 20 Jan 2016 20:25:38 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 91fbaa449 -> 1805c6b45
  refs/heads/camel-2.16.x eaefb7c3d -> ea6262b44
  refs/heads/master 6705ca952 -> b6355aed7


CAMEL-9526 - allow depends-on to contain multiple bean ids


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

Branch: refs/heads/master
Commit: b6355aed758572b18a5be5449f9f3bb5deb7c35d
Parents: 6705ca9
Author: Jonathan Anstey <janstey@gmail.com>
Authored: Wed Jan 20 16:54:10 2016 -0330
Committer: Jonathan Anstey <janstey@gmail.com>
Committed: Wed Jan 20 16:54:10 2016 -0330

----------------------------------------------------------------------
 .../org/apache/camel/blueprint/handler/CamelNamespaceHandler.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b6355aed/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 393004a..e03cbc0 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
@@ -261,7 +261,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
         factory2.addDependsOn(propertiesComponentResolver.getId());
         // We need to add other components which the camel context dependsOn
         if (ObjectHelper.isNotEmpty(ccfb.getDependsOn())) {
-            factory2.addDependsOn(ccfb.getDependsOn());
+            factory2.setDependsOn(Arrays.asList(ccfb.getDependsOn().split(" |,")));
         }
         context.getComponentDefinitionRegistry().registerComponentDefinition(factory2);
 
@@ -342,6 +342,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
         try {
             binder = getJaxbContext().createBinder();
         } catch (JAXBException e) {
+
             throw new ComponentDefinitionException("Failed to create the JAXB binder : "
+ e, e);
         }
         Object value = parseUsingJaxb(element, context, binder);


Mime
View raw message