This is an automated email from the ASF dual-hosted git repository.
ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 052eb62 IGNITE-12256 Fix double invocation of javaMajorVersion,
versions such as 9-Ubuntu - Fixes #6932.
052eb62 is described below
commit 052eb629a64498389d0feaca315c7be9a91edb20
Author: Ilya Kasnacheev <ilya.kasnach...@gmail.com>
AuthorDate: Mon Oct 7 14:11:21 2019 +0300
IGNITE-12256 Fix double invocation of javaMajorVersion, versions such as
9-Ubuntu - Fixes #6932.
Signed-off-by: Ilya Kasnacheev <ilya.kasnach...@gmail.com>
---
bin/control.sh | 2 --
bin/ignite-tf.sh | 2 --
bin/ignite.sh | 2 --
bin/ignitevisorcmd.sh | 2 --
bin/include/functions.sh | 2 +-
modules/sqlline/bin/sqlline.sh | 2 --
modules/web-console/web-agent/bin/ignite-web-agent.sh | 2 --
modules/web-console/web-agent/bin/include/functions.sh | 2 +-
8 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/bin/control.sh b/bin/control.sh
index 2da255f..0e04686 100755
--- a/bin/control.sh
+++ b/bin/control.sh
@@ -148,8 +148,6 @@ fi
#
# Final JVM_OPTS for Java 9+ compatibility
#
-javaMajorVersion "${JAVA}"
-
if [ $version -eq 8 ] ; then
JVM_OPTS="\
-XX:+AggressiveOpts \
diff --git a/bin/ignite-tf.sh b/bin/ignite-tf.sh
index 806b55d..929634b 100755
--- a/bin/ignite-tf.sh
+++ b/bin/ignite-tf.sh
@@ -124,8 +124,6 @@
MAIN_CLASS=org.apache.ignite.tensorflow.submitter.JobSubmitter
#
# Final JVM_OPTS for Java 9+ compatibility
#
-javaMajorVersion "${JAVA_HOME}/bin/java"
-
if [ $version -eq 8 ] ; then
JVM_OPTS="\
-XX:+AggressiveOpts \
diff --git a/bin/ignite.sh b/bin/ignite.sh
index 6f2044d..ee12021 100755
--- a/bin/ignite.sh
+++ b/bin/ignite.sh
@@ -154,8 +154,6 @@ fi
#
# Final JVM_OPTS for Java 9+ compatibility
#
-javaMajorVersion "${JAVA}"
-
if [ $version -eq 8 ] ; then
JVM_OPTS="\
-XX:+AggressiveOpts \
diff --git a/bin/ignitevisorcmd.sh b/bin/ignitevisorcmd.sh
index 53f69e1..a7cb020 100755
--- a/bin/ignitevisorcmd.sh
+++ b/bin/ignitevisorcmd.sh
@@ -114,8 +114,6 @@ trap restoreSttySettings INT
#
# Final JVM_OPTS for Java 9+ compatibility
#
-javaMajorVersion "${JAVA_HOME}/bin/java"
-
if [ $version -eq 8 ] ; then
JVM_OPTS="\
-XX:+AggressiveOpts \
diff --git a/bin/include/functions.sh b/bin/include/functions.sh
index 44fab12..21a5310 100755
--- a/bin/include/functions.sh
+++ b/bin/include/functions.sh
@@ -35,7 +35,7 @@ set -o functrace
# Extract java version to `version` variable.
javaVersion() {
- version=$("$1" -version 2>&1 | awk -F '"' '/version/ {print $2}')
+ version=$("$1" -version 2>&1 | awk -F[\"\-] '/version/ {print $2}')
}
# Extract only major version of java to `version` variable.
diff --git a/modules/sqlline/bin/sqlline.sh b/modules/sqlline/bin/sqlline.sh
index 690cd1b..0a2075d 100644
--- a/modules/sqlline/bin/sqlline.sh
+++ b/modules/sqlline/bin/sqlline.sh
@@ -61,8 +61,6 @@ JVM_OPTS=${JVM_OPTS:-}
#
# Final JVM_OPTS for Java 9+ compatibility
#
-javaMajorVersion "${JAVA_HOME}/bin/java"
-
if [ $version -eq 8 ] ; then
JVM_OPTS="\
-XX:+AggressiveOpts \
diff --git a/modules/web-console/web-agent/bin/ignite-web-agent.sh
b/modules/web-console/web-agent/bin/ignite-web-agent.sh
index f2cb4d1..1df6616 100755
--- a/modules/web-console/web-agent/bin/ignite-web-agent.sh
+++ b/modules/web-console/web-agent/bin/ignite-web-agent.sh
@@ -60,8 +60,6 @@ JVM_OPTS="${JVM_OPTS} -Djava.net.useSystemProxies=true
-Djdk.http.auth.tunneling
#
# Final JVM_OPTS for Java 9+ compatibility
#
-javaMajorVersion "${JAVA_HOME}/bin/java"
-
if [ $version -eq 8 ] ; then
JVM_OPTS="\
-XX:+AggressiveOpts \
diff --git a/modules/web-console/web-agent/bin/include/functions.sh
b/modules/web-console/web-agent/bin/include/functions.sh
index 74f6d24..ef69b75 100644
--- a/modules/web-console/web-agent/bin/include/functions.sh
+++ b/modules/web-console/web-agent/bin/include/functions.sh
@@ -29,7 +29,7 @@
# Extract java version to `version` variable.
javaVersion() {
- version=$("$1" -version 2>&1 | awk -F '"' '/version/ {print $2}')
+ version=$("$1" -version 2>&1 | awk -F[\"\-] '/version/ {print $2}')
}
# Extract only major version of java to `version` variable.
