[camel] 02/04: Polished

[da...@apache.org]

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

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

commit be411d6be319aebe93c84ca3c8ac3317665decbc
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Apr 21 13:40:09 2019 +0200

    Polished
---
 .../src/main/java/org/apache/camel/impl/AbstractCamelContext.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java b/core/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java
index fcb8743..50cd84d 100644
--- a/core/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java
+++ b/core/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java
@@ -2555,7 +2555,6 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Mod
         }
 
         // Start runtime catalog
-        // TODO: remove me as already started earlier
         getExtension(RuntimeCamelCatalog.class);
 
         // re-create endpoint registry as the cache size limit may be set after the constructor of this instance was called.
@@ -2566,7 +2565,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Mod
         // Initialize declarative validator registry
         validatorRegistry = doAddService(createValidatorRegistry(validators));
 
-        // optimised to not include runtimeEndpointRegistry unlesstartServices its enabled or JMX statistics is in extended mode
+        // optimised to not include runtimeEndpointRegistry unless startServices its enabled or JMX statistics is in extended mode
         if (runtimeEndpointRegistry == null && getManagementStrategy() != null && getManagementStrategy().getManagementAgent() != null) {
             Boolean isEnabled = getManagementStrategy().getManagementAgent().getEndpointRuntimeStatisticsEnabled();
             boolean isExtended = getManagementStrategy().getManagementAgent().getStatisticsLevel().isExtended();
@@ -2577,7 +2576,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Mod
             }
         }
         if (runtimeEndpointRegistry != null) {
-            if (runtimeEndpointRegistry instanceof EventNotifier) {
+            if (runtimeEndpointRegistry instanceof EventNotifier && getManagementStrategy() != null) {
                 getManagementStrategy().addEventNotifier((EventNotifier) runtimeEndpointRegistry);
             }
             addService(runtimeEndpointRegistry, true, true);