diff options
Diffstat (limited to 'repl')
| -rw-r--r-- | repl/pom.xml | 1 | ||||
| -rw-r--r-- | repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/repl/pom.xml b/repl/pom.xml index b0e7877bbb..2dfe7ac900 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -127,7 +127,6 @@ <environmentVariables> <SPARK_HOME>${basedir}/..</SPARK_HOME> <SPARK_TESTING>1</SPARK_TESTING> - <SPARK_CLASSPATH>${spark.classpath}</SPARK_CLASSPATH> </environmentVariables> </configuration> </plugin> diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala index 14c3feb55c..87d94d51be 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala @@ -943,12 +943,14 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter, val conf = new SparkConf() .setMaster(master) .setAppName("Spark shell") - .setSparkHome(System.getenv("SPARK_HOME")) .setJars(jars) .set("spark.repl.class.uri", intp.classServer.uri) if (execUri != null) { conf.set("spark.executor.uri", execUri) } + if (System.getenv("SPARK_HOME") != null) { + conf.setSparkHome(System.getenv("SPARK_HOME")) + } sparkContext = new SparkContext(conf) echo("Created spark context..") sparkContext |