This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 96381e501f89a6050c036aa7cf232423c1261fa7 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Sep 29 15:27:42 2023 +0200 Polished --- .../camel/main/xml/blueprint/BlueprintXmlBeansHandler.java | 9 ++++++++- .../org/apache/camel/main/xml/spring/SpringXmlBeansHandler.java | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java index 4be053ce16e..c018de3addc 100644 --- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java +++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java @@ -282,9 +282,16 @@ public class BlueprintXmlBeansHandler { beansToDestroy.put(name, new KeyValueHolder<>(target, def.getDestroyMethod())); } + addBeanToCamelModel(camelContext, name, def); + } + + protected void addBeanToCamelModel(CamelContext camelContext, String name, RegistryBeanDefinition def) { // register bean in model Model model = camelContext.getCamelContextExtension().getContextPlugin(Model.class); - model.addRegistryBean(def); + if (model != null) { + LOG.debug("Adding OSGi <blueprint> XML bean: {} to DSL model", name); + model.addRegistryBean(def); + } } protected void destroyBean(String name, boolean remove) { diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/spring/SpringXmlBeansHandler.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/spring/SpringXmlBeansHandler.java index 22e1142975a..ff0ac2c8d14 100644 --- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/spring/SpringXmlBeansHandler.java +++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/spring/SpringXmlBeansHandler.java @@ -234,6 +234,7 @@ public class SpringXmlBeansHandler { } rrd.setType(def.getBeanClassName()); rrd.setName(name); + LOG.debug("Adding Spring <beans> XML bean: {} to DSL model", name); model.addRegistryBean(rrd); // factory bean/method
