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/1805c6b4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1805c6b4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1805c6b4 Branch: refs/heads/camel-2.15.x Commit: 1805c6b459043c4dc6e37bc94a2b9a9e4feaff1a Parents: 91fbaa4 Author: Jonathan Anstey <jans...@gmail.com> Authored: Wed Jan 20 16:54:10 2016 -0330 Committer: Jonathan Anstey <jans...@gmail.com> Committed: Wed Jan 20 16:55:22 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/1805c6b4/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 474d130..9096bc1 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);
