[camel] 17/32: Use doAddService for newly created services

[gn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 941e2ae92619dd8b8d2e5536036f6ddf0cceaafb
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 3 21:01:43 2020 +0100

    Use doAddService for newly created services
---
 .../apache/camel/impl/engine/AbstractCamelContext.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 160b839..d494187 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -4310,7 +4310,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
     }
 
     public void setXMLRoutesDefinitionLoader(XMLRoutesDefinitionLoader xmlRoutesDefinitionLoader) {
-        this.xmlRoutesDefinitionLoader = xmlRoutesDefinitionLoader;
+        this.xmlRoutesDefinitionLoader = doAddService(xmlRoutesDefinitionLoader);
     }
 
     public ModelToXMLDumper getModelToXMLDumper() {
@@ -4325,7 +4325,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
     }
 
     public void setModelToXMLDumper(ModelToXMLDumper modelToXMLDumper) {
-        this.modelToXMLDumper = modelToXMLDumper;
+        this.modelToXMLDumper = doAddService(modelToXMLDumper);
     }
 
     @Override
@@ -4342,7 +4342,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
 
     @Override
     public void setRuntimeCamelCatalog(RuntimeCamelCatalog runtimeCamelCatalog) {
-        this.runtimeCamelCatalog = runtimeCamelCatalog;
+        this.runtimeCamelCatalog = doAddService(runtimeCamelCatalog);
     }
 
     @Override
@@ -4379,25 +4379,33 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
         if (beanProxyFactory == null) {
             synchronized (lock) {
                 if (beanProxyFactory == null) {
-                    beanProxyFactory = createBeanProxyFactory();
+                    setBeanProxyFactory(createBeanProxyFactory());
                 }
             }
         }
         return beanProxyFactory;
     }
 
+    public void setBeanProxyFactory(BeanProxyFactory beanProxyFactory) {
+        this.beanProxyFactory = doAddService(beanProxyFactory);
+    }
+
     @Override
     public BeanProcessorFactory getBeanProcessorFactory() {
         if (beanProcessorFactory == null) {
             synchronized (lock) {
                 if (beanProcessorFactory == null) {
-                    beanProcessorFactory = createBeanProcessorFactory();
+                    setBeanProcessorFactory(createBeanProcessorFactory());
                 }
             }
         }
         return beanProcessorFactory;
     }
 
+    public void setBeanProcessorFactory(BeanProcessorFactory beanProcessorFactory) {
+        this.beanProcessorFactory = doAddService(beanProcessorFactory);
+    }
+
     protected Map<String, BaseRouteService> getRouteServices() {
         return routeServices;
     }