aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMatthew Farrellee <matt@redhat.com>2014-09-15 10:57:53 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-09-15 10:57:59 -0700
commitfe2b1d6a209db9fe96b1c6630677955b94bd48c9 (patch)
treeaa3974345f2c3b16e4679982e5e8d276cd098191 /bin
parentcc14644460872efb344e8d895859d70213a40840 (diff)
downloadspark-fe2b1d6a209db9fe96b1c6630677955b94bd48c9.tar.gz
spark-fe2b1d6a209db9fe96b1c6630677955b94bd48c9.tar.bz2
spark-fe2b1d6a209db9fe96b1c6630677955b94bd48c9.zip
[SPARK-3425] do not set MaxPermSize for OpenJDK 1.8
Closes #2387 Author: Matthew Farrellee <matt@redhat.com> Closes #2301 from mattf/SPARK-3425 and squashes the following commits: 20f3c09 [Matthew Farrellee] [SPARK-3425] do not set MaxPermSize for OpenJDK 1.8
Diffstat (limited to 'bin')
-rwxr-xr-xbin/spark-class2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/spark-class b/bin/spark-class
index 5f5f9ea748..613dc9c456 100755
--- a/bin/spark-class
+++ b/bin/spark-class
@@ -105,7 +105,7 @@ else
exit 1
fi
fi
-JAVA_VERSION=$("$RUNNER" -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
+JAVA_VERSION=$("$RUNNER" -version 2>&1 | sed 's/.* version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
# Set JAVA_OPTS to be able to load native libraries and to set heap size
if [ "$JAVA_VERSION" -ge 18 ]; then