[ISSUE apache#6026] Fix the problem that the custom JAVA_HOME environ…

…ment variable does not take effect
Oliverwqcwrw · Feb 23, 2023 · fc78aa3 · fc78aa3
1 parent 7cfffe7
commit fc78aa3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/distribution/bin/runbroker.sh b/distribution/bin/runbroker.sh
@@ -28,6 +28,10 @@ find_java_home()
 {
     case "`uname`" in
         Darwin)
+          if [ -n "$JAVA_HOME" ]; then
+            JAVA_HOME=$JAVA_HOME
+            return
+          fi
             JAVA_HOME=$(/usr/libexec/java_home)
         ;;
         *)

diff --git a/distribution/bin/runserver.sh b/distribution/bin/runserver.sh
@@ -28,6 +28,10 @@ find_java_home()
 {
     case "`uname`" in
         Darwin)
+          if [ -n "$JAVA_HOME" ]; then
+              JAVA_HOME=$JAVA_HOME
+              return
+          fi
             JAVA_HOME=$(/usr/libexec/java_home)
         ;;
         *)

diff --git a/distribution/bin/tools.sh b/distribution/bin/tools.sh
@@ -28,6 +28,10 @@ find_java_home()
 {
     case "`uname`" in
         Darwin)
+          if [ -n "$JAVA_HOME" ]; then
+              JAVA_HOME=$JAVA_HOME
+              return
+          fi
             JAVA_HOME=$(/usr/libexec/java_home)
         ;;
         *)