From fed0e9a9f3ba9a7ab9834cc43b3d7e2060c27a6b Mon Sep 17 00:00:00 2001
From: Benjamin Graf <benjamin.graf@gmx.net>
Date: Sun, 20 Nov 2016 17:27:31 +0100
Subject: [PATCH] AMQ-5247: Make jmxUseLocal global settable

---
 .../apache/activemq/console/command/AbstractJmxCommand.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
index 629ccd82696..97e508450a0 100644
--- a/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
+++ b/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
@@ -38,11 +38,11 @@ public abstract class AbstractJmxCommand extends AbstractCommand {
     public static String DEFAULT_JMX_URL;
     private static String jmxUser;
     private static String jmxPassword;
+    private static boolean jmxUseLocal;
     private static final String CONNECTOR_ADDRESS =
         "com.sun.management.jmxremote.localConnectorAddress";
 
     private JMXServiceURL jmxServiceUrl;
-    private boolean jmxUseLocal;
     private JMXConnector jmxConnector;
     private MBeanServerConnection jmxConnection;
 
@@ -50,6 +50,7 @@ public abstract class AbstractJmxCommand extends AbstractCommand {
         DEFAULT_JMX_URL = System.getProperty("activemq.jmx.url", "service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi");
         jmxUser = System.getProperty("activemq.jmx.user");
         jmxPassword = System.getProperty("activemq.jmx.password");
+        jmxUseLocal = Boolean.parseBoolean(System.getProperty("activemq.jmx.useLocal", "false"));
     }
 
     /**
@@ -255,7 +256,7 @@ public boolean isJmxUseLocal() {
      * @param jmxUseLocal - <code>true</code> if the mbean server from this JVM should be used, <code>false<code> if the jmx url should be used
      */
     public void setJmxUseLocal(boolean jmxUseLocal) {
-        this.jmxUseLocal = jmxUseLocal;
+        AbstractJmxCommand.jmxUseLocal = jmxUseLocal;
     }
 
     /**