[ISSUE #10171] Support custom JAVA_HOME on Linux in runbroker.sh and runserver.sh (#10172)

Author: majialoong

distribution/bin/runbroker.sh

@@ -26,12 +26,11 @@ error_exit ()
 
 find_java_home()
 {
+    if [ -n "$JAVA_HOME" ]; then
+        return
+    fi
     case "`uname`" in
         Darwin)
-          if [ -n "$JAVA_HOME" ]; then
-            JAVA_HOME=$JAVA_HOME
-            return
-          fi
             JAVA_HOME=$(/usr/libexec/java_home)
         ;;
         *)

distribution/bin/runserver.sh

@@ -26,12 +26,11 @@ error_exit ()
 
 find_java_home()
 {
+    if [ -n "$JAVA_HOME" ]; then
+        return
+    fi
     case "`uname`" in
         Darwin)
-          if [ -n "$JAVA_HOME" ]; then
-              JAVA_HOME=$JAVA_HOME
-              return
-          fi
             JAVA_HOME=$(/usr/libexec/java_home)
         ;;
         *)

distribution/bin/tools.sh

@@ -27,7 +27,6 @@ error_exit ()
 find_java_home()
 {
     if [ -n "$JAVA_HOME" ]; then
-        JAVA_HOME=$JAVA_HOME
         return
     fi
     case "`uname`" in