[camel] 01/04: CAMEL-14870: Fixed camel-test could not disable JMX via system property override

[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

commit e7120bbca852e784062f4f7c4c03b1508ebced0d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Apr 8 17:07:09 2020 +0200

    CAMEL-14870: Fixed camel-test could not disable JMX via system property 
override
---
 .../java/org/apache/camel/impl/engine/AbstractCamelContext.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 0ebe357..a0a63ef 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
@@ -3767,7 +3767,12 @@ public abstract class AbstractCamelContext extends 
BaseService
     }
 
     public boolean isJMXDisabled() {
-        return disableJMX;
+        String override = System.getProperty("org.apache.camel.jmx.disabled");
+        if (override != null) {
+            return "true".equals(override);
+        } else {
+            return disableJMX;
+        }
     }
 
     @Override