[camel] branch master updated: CAMEL-15081: Polished

[davsclaus]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 7894007  CAMEL-15081: Polished
7894007 is described below

commit 7894007037562a4f130485fdab5e935709296909
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu May 28 07:51:40 2020 +0200

    CAMEL-15081: Polished
---
 .../java/org/apache/camel/health/HealthCheckService.java     |  3 ++-
 .../camel/core/xml/AbstractCamelContextFactoryBean.java      | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git 
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java 
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java
index b3e12a6..5a2acd3 100644
--- 
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java
+++ 
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java
@@ -24,12 +24,13 @@ import java.util.function.BiConsumer;
 
 import org.apache.camel.CamelContextAware;
 import org.apache.camel.Service;
+import org.apache.camel.StaticService;
 
 /**
  * An health check service that invokes the checks registered on the {@link 
HealthCheckRegistry}
  * according to a schedule.
  */
-public interface HealthCheckService extends Service, CamelContextAware {
+public interface HealthCheckService extends StaticService, CamelContextAware {
 
     /**
      * Add a listener to invoke when the state of a check change.
diff --git 
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
 
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index ba4457c..029c77f 100644
--- 
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ 
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -370,11 +370,13 @@ public abstract class AbstractCamelContextFactoryBean<T 
extends ModelCamelContex
         } else {
             healthCheckRegistry = HealthCheckRegistry.get(getContext());
         }
-        // Health check repository
-        Set<HealthCheckRepository> repositories = 
getContext().getRegistry().findByType(HealthCheckRepository.class);
-        if (org.apache.camel.util.ObjectHelper.isNotEmpty(repositories)) {
-            for (HealthCheckRepository repository: repositories) {
-                healthCheckRegistry.addRepository(repository);
+        if (healthCheckRegistry != null) {
+            // Health check repository
+            Set<HealthCheckRepository> repositories = 
getContext().getRegistry().findByType(HealthCheckRepository.class);
+            if (org.apache.camel.util.ObjectHelper.isNotEmpty(repositories)) {
+                for (HealthCheckRepository repository : repositories) {
+                    healthCheckRegistry.addRepository(repository);
+                }
             }
         }
         // Health check service