[camel] branch main updated: (chores) camel-base-engine: fix JMX enable/disable logic

[orpiske]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new e4a3faea7d1 (chores) camel-base-engine: fix JMX enable/disable logic
e4a3faea7d1 is described below

commit e4a3faea7d167f839f2fd97b3b56b244ba768d3c
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed Mar 29 14:27:12 2023 +0200

    (chores) camel-base-engine: fix JMX enable/disable logic
---
 .../java/org/apache/camel/impl/engine/AbstractCamelContext.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 696f9d37e30..74cebcb0ed0 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -3416,7 +3416,11 @@ public abstract class AbstractCamelContext extends 
BaseService
 
     public boolean isJMXDisabled() {
         String override = System.getProperty(JmxSystemPropertyKeys.DISABLED);
-        return Boolean.valueOf(override);
+        if (override != null) {
+            return Boolean.valueOf(override);
+        }
+
+        return disableJMX;
     }
 
     void enableDebugging(DebuggerFactory df) throws Exception {