From f585bb0945e612aada9c367e43bda34abe776b3e Mon Sep 17 00:00:00 2001
From: GuoQiang Li <witgo@qq.com>
Date: Sun, 2 Nov 2014 01:32:56 +0800
Subject: [PATCH 1/3] Spark shell class path is not correctly set if
 "spark.driver.extraClassPath" is set in defaults.conf

---
 bin/spark-class | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/spark-class b/bin/spark-class
index 91b0e30e20557..abf29c670465b 100755
--- a/bin/spark-class
+++ b/bin/spark-class
@@ -107,7 +107,7 @@ else
 fi
 
 # Set JAVA_OPTS to be able to load native libraries and to set heap size
-JAVA_OPTS="-XX:MaxPermSize=128m $OUR_JAVA_OPTS"
+JAVA_OPTS="-Dscala.usejavacp=true -XX:MaxPermSize=128m $OUR_JAVA_OPTS"
 JAVA_OPTS="$JAVA_OPTS -Xms$OUR_JAVA_MEM -Xmx$OUR_JAVA_MEM"
 
 # Load extra JAVA_OPTS from conf/java-opts, if it exists

From 353684c6277e3ca05ad452525eaa793d1ffc664f Mon Sep 17 00:00:00 2001
From: GuoQiang Li <witgo@qq.com>
Date: Fri, 5 Dec 2014 13:28:05 +0800
Subject: [PATCH 2/3] review commit

---
 bin/spark-class | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/spark-class b/bin/spark-class
index abf29c670465b..6b88805352278 100755
--- a/bin/spark-class
+++ b/bin/spark-class
@@ -107,6 +107,7 @@ else
 fi
 
 # Set JAVA_OPTS to be able to load native libraries and to set heap size
+# SPARK-3936: scala does not assume use of the java classpath, so we need to add the "-Dscala.usejavacp=true"
 JAVA_OPTS="-Dscala.usejavacp=true -XX:MaxPermSize=128m $OUR_JAVA_OPTS"
 JAVA_OPTS="$JAVA_OPTS -Xms$OUR_JAVA_MEM -Xmx$OUR_JAVA_MEM"
 

From 0ee7cd3be352e86bcd84dc3d42f56e9610a20688 Mon Sep 17 00:00:00 2001
From: GuoQiang Li <witgo@qq.com>
Date: Wed, 10 Dec 2014 10:47:26 +0800
Subject: [PATCH 3/3] move usejavacp opt to spark-shell

---
 bin/spark-class | 3 +--
 bin/spark-shell | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/spark-class b/bin/spark-class
index 6b88805352278..91b0e30e20557 100755
--- a/bin/spark-class
+++ b/bin/spark-class
@@ -107,8 +107,7 @@ else
 fi
 
 # Set JAVA_OPTS to be able to load native libraries and to set heap size
-# SPARK-3936: scala does not assume use of the java classpath, so we need to add the "-Dscala.usejavacp=true"
-JAVA_OPTS="-Dscala.usejavacp=true -XX:MaxPermSize=128m $OUR_JAVA_OPTS"
+JAVA_OPTS="-XX:MaxPermSize=128m $OUR_JAVA_OPTS"
 JAVA_OPTS="$JAVA_OPTS -Xms$OUR_JAVA_MEM -Xmx$OUR_JAVA_MEM"
 
 # Load extra JAVA_OPTS from conf/java-opts, if it exists
diff --git a/bin/spark-shell b/bin/spark-shell
index 0ab4e14f5b744..890a880e4676c 100755
--- a/bin/spark-shell
+++ b/bin/spark-shell
@@ -45,6 +45,9 @@ source $FWDIR/bin/utils.sh
 SUBMIT_USAGE_FUNCTION=usage
 gatherSparkSubmitOpts "$@"
 
+# SPARK-4161: scala does not assume use of the java classpath, so we need to add the "-Dscala.usejavacp=true"
+SPARK_SUBMIT_OPTS="$SPARK_SUBMIT_OPTS -Dscala.usejavacp=true"
+
 function main() {
   if $cygwin; then
     # Workaround for issue involving JLine and Cygwin