aboutsummaryrefslogtreecommitdiff
path: root/bin/spark-class
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-05-04 12:22:23 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-05-04 12:22:23 -0700
commit0c98a8f6a761b941a9e0cf6fde6df8d0b8d24057 (patch)
tree23e422a365b2e98f0f8e86e3dbb51000449a8155 /bin/spark-class
parent0088cede592540f35f9aec0f24dc1d9bd690d878 (diff)
downloadspark-0c98a8f6a761b941a9e0cf6fde6df8d0b8d24057.tar.gz
spark-0c98a8f6a761b941a9e0cf6fde6df8d0b8d24057.tar.bz2
spark-0c98a8f6a761b941a9e0cf6fde6df8d0b8d24057.zip
SPARK-1703 Warn users if Spark is run on JRE6 but compiled with JDK7.
This add some guards and good warning messages if users hit this issue. /cc @aarondav with whom I discussed parts of the design. Author: Patrick Wendell <pwendell@gmail.com> Closes #627 from pwendell/jdk6 and squashes the following commits: a38a958 [Patrick Wendell] Code review feedback 94e9f84 [Patrick Wendell] SPARK-1703 Warn users if Spark is run on JRE6 but compiled with JDK7.
Diffstat (limited to 'bin/spark-class')
-rwxr-xr-xbin/spark-class9
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/spark-class b/bin/spark-class
index e8160c8af6..72f8b9bf9a 100755
--- a/bin/spark-class
+++ b/bin/spark-class
@@ -138,7 +138,14 @@ if [ -e "$TOOLS_DIR"/target/spark-tools*[0-9Tg].jar ]; then
fi
# Compute classpath using external script
-CLASSPATH=`$FWDIR/bin/compute-classpath.sh`
+classpath_output=$($FWDIR/bin/compute-classpath.sh)
+if [[ "$?" != "0" ]]; then
+ echo "$classpath_output"
+ exit 1
+else
+ CLASSPATH=$classpath_output
+fi
+
if [[ "$1" =~ org.apache.spark.tools.* ]]; then
CLASSPATH="$CLASSPATH:$SPARK_TOOLS_JAR"
fi