From 7d7cee302a60e09894909cef35aa6f7d9a022b34 Mon Sep 17 00:00:00 2001
From: jxiang <jxiang@unknown>
Date: Tue, 11 Dec 2012 00:57:31 +0000
Subject: [PATCH] HBASE-7314 Can't start REST/Thrift server if HBASE_JMX_OPTS
 not set

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1419955 13f79535-47bb-0310-9956-ffa450edef68
---
 bin/hbase-config.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index ff584fff369..6a1cd9b1485 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -76,7 +76,7 @@ HBASE_REGIONSERVERS="${HBASE_REGIONSERVERS:-$HBASE_CONF_DIR/regionservers}"
 # List of hbase secondary masters.
 HBASE_BACKUP_MASTERS="${HBASE_BACKUP_MASTERS:-$HBASE_CONF_DIR/backup-masters}"
 # Thrift JMX opts
-if [ -z "$HBASE_THRIFT_JMX_OPTS" ]; then
+if [[ -n "$HBASE_JMX_OPTS" && -z "$HBASE_THRIFT_JMX_OPTS" ]]; then
   HBASE_THRIFT_JMX_OPTS="$HBASE_JMX_OPTS -Dcom.sun.management.jmxremote.port=10103"
 fi
 # Thrift opts
@@ -85,7 +85,7 @@ if [ -z "$HBASE_THRIFT_OPTS" ]; then
 fi
 
 # REST JMX opts
-if [ -z "$HBASE_REST_JMX_OPTS" ]; then
+if [[ -n "$HBASE_JMX_OPTS" && -z "$HBASE_REST_JMX_OPTS" ]]; then
   HBASE_REST_JMX_OPTS="$HBASE_JMX_OPTS -Dcom.sun.management.jmxremote.port=10105"
 fi
 # REST opts