diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh index 5d13859..0098589 100644 --- a/bin/hbase-config.sh +++ b/bin/hbase-config.sh @@ -76,11 +76,9 @@ HBASE_REGIONSERVERS="${HBASE_REGIONSERVERS:-$HBASE_CONF_DIR/regionservers}" # List of hbase secondary masters. HBASE_BACKUP_MASTERS="${HBASE_BACKUP_MASTERS:-$HBASE_CONF_DIR/backup-masters}" -# Source the hbase-env.sh. Will have JAVA_HOME defined. -if [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then - . "${HBASE_CONF_DIR}/hbase-env.sh" -fi - +# Presume hbase-env.sh with its JAVA_HOME already defined (hbase-config.sh +# is not usually called directly but from inside bin/hbase-daemon.sh, etc., +# and it has sourced hbase-env.sh) if [ -z "$JAVA_HOME" ]; then for candidate in \ /usr/lib/jvm/java-6-sun \