aboutsummaryrefslogtreecommitdiff
path: root/repl/src/main
diff options
context:
space:
mode:
authorPrashant Sharma <prashant.s@imaginea.com>2014-01-03 14:37:42 +0530
committerPrashant Sharma <prashant.s@imaginea.com>2014-01-03 14:43:37 +0530
commit94f2fffa23436ed66a24c705f88dabe59bf54037 (patch)
treea83d3f9e512183903e1b69fccdd0d2bcef1663ab /repl/src/main
parentb4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc (diff)
downloadspark-94f2fffa23436ed66a24c705f88dabe59bf54037.tar.gz
spark-94f2fffa23436ed66a24c705f88dabe59bf54037.tar.bz2
spark-94f2fffa23436ed66a24c705f88dabe59bf54037.zip
fixed review comments
Diffstat (limited to 'repl/src/main')
-rw-r--r--repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala4
1 files changed, 3 insertions, 1 deletions
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 f108c70f21..7e54421b52 100644
--- a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala
+++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala
@@ -942,12 +942,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