From ad93f3b6eb2b49f47cb55e09a9edfe42ce9e00e9 Mon Sep 17 00:00:00 2001
From: Thorkild Stray <thorkild-asfjira@stray.priv.no>
Date: Fri, 9 Oct 2015 13:06:33 +0200
Subject: [PATCH] Allow LOCAL_JMX to be easily overridden

patch by Thorkild Stray ; reviewed by Robert Stupp for CASSANDRA-10275
---
 CHANGES.txt           | 1 +
 conf/cassandra-env.sh | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a9b11aeb11..7aa5eace28 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.11
+ * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
  * Mark nodes as dead even if they've already left (CASSANDRA-10205)
  * Update internal python driver used by cqlsh (CASSANDRA-10161)
 
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 73217bbbe6..eccea489c7 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -276,7 +276,9 @@ JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true"
 # To enable remote JMX connections, uncomment lines below
 # with authentication and/or ssl enabled. See https://wiki.apache.org/cassandra/JmxSecurity 
 #
-LOCAL_JMX=yes
+if [ "x$LOCAL_JMX" = "x" ]; then
+    LOCAL_JMX=yes
+fi
 
 if [ "$LOCAL_JMX" = "yes" ]; then
   JVM_OPTS="$JVM_OPTS -Dcassandra.jmx.local.port=$JMX_PORT -XX:+DisableExplicitGC"