You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/05/10 07:40:11 UTC
[flink] branch release-1.7 updated: [FLINK-9445][scala] Scala-shell
uses JAVA_RUN
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.7
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.7 by this push:
new e5211d8 [FLINK-9445][scala] Scala-shell uses JAVA_RUN
e5211d8 is described below
commit e5211d8af4dc5fc250b531c3349223387212b44b
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 cc6ebb0..b6da81a 100644
--- a/flink-scala-shell/start-script/start-scala-shell.sh
+++ b/flink-scala-shell/start-script/start-scala-shell.sh
@@ -97,9 +97,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