Revert hack

dbtsai · dbtsai · commit 82ca5f6fdabc · 2018-06-10T23:28:40.000-07:00
diff --git a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkILoop.scala
@@ -87,22 +87,6 @@ class SparkILoop(in0: Option[BufferedReader], out: JPrintWriter)
 
   /** Print a welcome message */
   override def printWelcome() {
-    // Before Scala 2.11.9, `printWelcome()` will be called after Scala REPL and Spark
-    // are initialized, so we will not call `initializeSynchronous()` in `printWelcome()`.
-    //
-    // However, after Scala 2.11.9, `printWelcome()` will be the first thing to be called,
-    // so we initialize the Scala REPL and Spark here instead.
-    if (intp == null) {
-      createInterpreter()
-    }
-    echo(s"DB printWelcome 1  ${intp.isInitializeComplete}" )
-
-    if (!intp.isInitializeComplete) {
-      intp.initializeSynchronous()
-    }
-
-    echo(s"DB printWelcome 2  ${intp.isInitializeComplete}" )
-
     import org.apache.spark.SPARK_VERSION
     echo("""Welcome to
       ____              __
diff --git a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkILoopInterpreter.scala b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkILoopInterpreter.scala
@@ -34,14 +34,8 @@ class SparkILoopInterpreter(settings: Settings, out: JPrintWriter, initializeSpa
    * See the discussion in Scala community https://github.com/scala/bug/issues/10913 for detail.
    */
   override def initializeSynchronous(): Unit = {
-    // scalastyle:off println
-    println(s"DB initializeSynchronous  ${isInitializeComplete}" )
-    // scalastyle:on println
-
-    if (!isInitializeComplete) {
-      super.initializeSynchronous()
-      initializeSpark()
-    }
+    super.initializeSynchronous()
+    initializeSpark()
   }
 
   override lazy val memberHandlers = new {
