From ffc0e4a363968fa62a592f96e37669ca1bcbf099 Mon Sep 17 00:00:00 2001 From: Yin Huai Date: Wed, 3 Aug 2016 19:57:47 -0700 Subject: [PATCH] [SPARK-16887] Add SPARK_DIST_CLASSPATH to LAUNCH_CLASSPATH --- bin/spark-class | 2 +- bin/spark-class2.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/spark-class b/bin/spark-class index 658e076bc0462..cc1548f938692 100755 --- a/bin/spark-class +++ b/bin/spark-class @@ -47,7 +47,7 @@ if [ ! -d "$SPARK_JARS_DIR" ] && [ -z "$SPARK_TESTING$SPARK_SQL_TESTING" ]; then echo "You need to build Spark with the target \"package\" before running this program." 1>&2 exit 1 else - LAUNCH_CLASSPATH="$SPARK_JARS_DIR/*" + LAUNCH_CLASSPATH="$SPARK_JARS_DIR/*:$SPARK_DIST_CLASSPATH" fi # Add the launcher build dir to the classpath if requested. diff --git a/bin/spark-class2.cmd b/bin/spark-class2.cmd index 869c0b202f7f3..8c90face77802 100644 --- a/bin/spark-class2.cmd +++ b/bin/spark-class2.cmd @@ -41,7 +41,7 @@ if not exist "%SPARK_JARS_DIR%"\ ( exit /b 1 ) -set LAUNCH_CLASSPATH=%SPARK_JARS_DIR%\* +set LAUNCH_CLASSPATH="%SPARK_JARS_DIR%\*;%SPARK_DIST_CLASSPATH%" rem Add the launcher build dir to the classpath if requested. if not "x%SPARK_PREPEND_CLASSES%"=="x" (