aboutsummaryrefslogtreecommitdiff
path: root/repl
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2016-01-13 11:53:59 -0800
committerReynold Xin <rxin@databricks.com>2016-01-13 11:53:59 -0800
commit38148f7373ee678cd538ce5eae0a75e15c62db8a (patch)
treebf4145879e60cb60bf494deb1177641796d79e0d /repl
parentcc91e21879e031bcd05316eabb856e67a51b191d (diff)
downloadspark-38148f7373ee678cd538ce5eae0a75e15c62db8a.tar.gz
spark-38148f7373ee678cd538ce5eae0a75e15c62db8a.tar.bz2
spark-38148f7373ee678cd538ce5eae0a75e15c62db8a.zip
[SPARK-12761][CORE] Remove duplicated code
Removes some duplicated code that was reintroduced during a merge. Author: Jakob Odersky <jodersky@gmail.com> Closes #10711 from jodersky/repl-2.11-duplicate.
Diffstat (limited to 'repl')
-rw-r--r--repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala6
1 files changed, 1 insertions, 5 deletions
diff --git a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala
index 44650f25f7..bb3081d129 100644
--- a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala
+++ b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala
@@ -30,11 +30,7 @@ object Main extends Logging {
val conf = new SparkConf()
val rootDir = conf.getOption("spark.repl.classdir").getOrElse(Utils.getLocalDir(conf))
val outputDir = Utils.createTempDir(root = rootDir, namePrefix = "repl")
- val s = new Settings()
- s.processArguments(List("-Yrepl-class-based",
- "-Yrepl-outdir", s"${outputDir.getAbsolutePath}",
- "-classpath", getAddedJars.mkString(File.pathSeparator)), true)
- // the creation of SecurityManager has to be lazy so SPARK_YARN_MODE is set if needed
+
var sparkContext: SparkContext = _
var sqlContext: SQLContext = _
var interp = new SparkILoop // this is a public var because tests reset it.