diff options
| author | Daniel Darabos <darabos.daniel@gmail.com> | 2014-12-19 19:32:39 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2014-12-19 19:32:46 -0800 |
| commit | 7cb3f54793124c527d62906c565aba2c3544e422 (patch) | |
| tree | 7cff64010fb49b5ce03f580ae8aa5503a194526e /bin | |
| parent | 1d648123a77bbcd9b7a34cc0d66c14fa85edfecd (diff) | |
| download | spark-7cb3f54793124c527d62906c565aba2c3544e422.tar.gz spark-7cb3f54793124c527d62906c565aba2c3544e422.tar.bz2 spark-7cb3f54793124c527d62906c565aba2c3544e422.zip | |
[SPARK-4831] Do not include SPARK_CLASSPATH if empty
My guess for fixing https://issues.apache.org/jira/browse/SPARK-4831.
Author: Daniel Darabos <darabos.daniel@gmail.com>
Closes #3678 from darabos/patch-1 and squashes the following commits:
36e1243 [Daniel Darabos] Do not include SPARK_CLASSPATH if empty.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/compute-classpath.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh index 685051eeed..a31ea73d3c 100755 --- a/bin/compute-classpath.sh +++ b/bin/compute-classpath.sh @@ -25,7 +25,11 @@ FWDIR="$(cd "`dirname "$0"`"/..; pwd)" . "$FWDIR"/bin/load-spark-env.sh -CLASSPATH="$SPARK_CLASSPATH:$SPARK_SUBMIT_CLASSPATH" +if [ -n "$SPARK_CLASSPATH" ]; then + CLASSPATH="$SPARK_CLASSPATH:$SPARK_SUBMIT_CLASSPATH" +else + CLASSPATH="$SPARK_SUBMIT_CLASSPATH" +fi # Build up classpath if [ -n "$SPARK_CONF_DIR" ]; then |