This is an automated email from the ASF dual-hosted git repository.

tangyun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new e7c8cd1562e [FLINK-34072][scripts] Replace java command to JAVA_RUN in 
config.sh
e7c8cd1562e is described below

commit e7c8cd1562ebd45c1f7b48f519a11c6cd4fdf100
Author: Yu Chen <yuchen.e...@gmail.com>
AuthorDate: Sun Jan 14 20:57:05 2024 +0800

    [FLINK-34072][scripts] Replace java command to JAVA_RUN in config.sh
---
 flink-dist/src/main/flink-bin/bin/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-dist/src/main/flink-bin/bin/config.sh 
b/flink-dist/src/main/flink-bin/bin/config.sh
index dcd48a256f7..363e17a375f 100755
--- a/flink-dist/src/main/flink-bin/bin/config.sh
+++ b/flink-dist/src/main/flink-bin/bin/config.sh
@@ -335,7 +335,7 @@ if [ -z "${FLINK_ENV_JAVA_OPTS}" ]; then
     # Remove leading and ending double quotes (if present) of value
     FLINK_ENV_JAVA_OPTS="-XX:+IgnoreUnrecognizedVMOptions $( echo 
"${FLINK_ENV_JAVA_OPTS}" | sed -e 's/^"//'  -e 's/"$//' )"
 
-    JAVA_SPEC_VERSION=`${JAVA_HOME}/bin/java -XshowSettings:properties 2>&1 | 
grep "java.specification.version" | cut -d "=" -f 2 | tr -d '[:space:]' | rev | 
cut -d "." -f 1 | rev`
+    JAVA_SPEC_VERSION=`"${JAVA_RUN}" -XshowSettings:properties 2>&1 | grep 
"java.specification.version" | cut -d "=" -f 2 | tr -d '[:space:]' | rev | cut 
-d "." -f 1 | rev`
     if [[ $(( $JAVA_SPEC_VERSION > 17 )) == 1 ]]; then
       # set security manager property to allow calls to 
System.setSecurityManager() at runtime
       FLINK_ENV_JAVA_OPTS="$FLINK_ENV_JAVA_OPTS -Djava.security.manager=allow"

Reply via email to