[flink] branch master updated: [FLINK-9445][scala] Scala-shell uses JAVA_RUN

[ch...@apache.org]

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

chesnay 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 f3252c4  [FLINK-9445][scala] Scala-shell uses JAVA_RUN
f3252c4 is described below

commit f3252c474a4d338c92f5a188d7fae17e9c25c73b
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Thu May 9 09:53:17 2019 +0200

    [FLINK-9445][scala] Scala-shell uses JAVA_RUN
---
 flink-scala-shell/start-script/start-scala-shell.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flink-scala-shell/start-script/start-scala-shell.sh b/flink-scala-shell/start-script/start-scala-shell.sh
index 4bc5d25..96ca805 100644
--- a/flink-scala-shell/start-script/start-scala-shell.sh
+++ b/flink-scala-shell/start-script/start-scala-shell.sh
@@ -104,9 +104,9 @@ log_setting="-Dlog.file="$LOG" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/$LOG
 
 if ${EXTERNAL_LIB_FOUND}
 then
-    java -Dscala.color -cp "$FLINK_CLASSPATH" $log_setting org.apache.flink.api.scala.FlinkShell $@ --addclasspath "$EXT_CLASSPATH"
+    $JAVA_RUN -Dscala.color -cp "$FLINK_CLASSPATH" $log_setting org.apache.flink.api.scala.FlinkShell $@ --addclasspath "$EXT_CLASSPATH"
 else
-    java -Dscala.color -cp "$FLINK_CLASSPATH" $log_setting org.apache.flink.api.scala.FlinkShell $@
+    $JAVA_RUN -Dscala.color -cp "$FLINK_CLASSPATH" $log_setting org.apache.flink.api.scala.FlinkShell $@
 fi
 
 #restore echo