You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/01/03 11:20:39 UTC
[camel] 06/06: Polished
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
commit 37807ad00aebbf186cd061727408ba47339ae8e3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jan 3 12:16:36 2020 +0100
Polished
---
.../org/apache/camel/impl/engine/AbstractCamelContext.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 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 85f7a97..0ac8bff 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
@@ -3546,7 +3546,9 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
@Override
public void setupManagement(Map<String, Object> options) {
- ManagementStrategyFactory factory = new DefaultManagementStrategyFactory();
+ log.trace("Setting up management");
+
+ ManagementStrategyFactory factory = null;
if (!isJMXDisabled()) {
try {
FactoryFinder finder = getFactoryFinder("META-INF/services/org/apache/camel/management/");
@@ -3557,9 +3559,13 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
}
}
} catch (Exception e) {
- log.warn("Cannot create JMX lifecycle strategy. Will fallback and disable JMX.", e);
+ log.warn("Cannot create JmxManagementStrategyFactory. Will fallback and disable JMX.", e);
}
}
+ if (factory == null) {
+ factory = new DefaultManagementStrategyFactory();
+ }
+ log.debug("Setting up management with factory: {}", factory);
// preserve any existing event notifiers that may have been already added
List<EventNotifier> notifiers = null;
@@ -3567,7 +3573,6 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
notifiers = managementStrategy.getEventNotifiers();
}
- log.debug("Setting up management with factory: {}", factory);
try {
ManagementStrategy strategy = factory.create(this, options);
if (notifiers != null) {