Fix compilation

apache · Jun 8, 2018 · 4c852fa · 4c852fa
1 parent 96e87c2
commit 4c852fa
Showing 1 changed file with 9 additions and 5 deletions.
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,11 +87,15 @@ class SparkILoop(in0: Option[BufferedReader], out: JPrintWriter)
 
   /** Print a welcome message */
   override def printWelcome() {
-    // Before Scala 2.11.9, `printWelcome()` will be the last thing to be called,
-    // so Scala REPL and Spark will be initialized before `printWelcome()`.
-    // After Scala 2.11.9, `printWelcome()` will be the first thing to be called,
-    // as a result, Scala REPL and Spark will be initialized in `printWelcome()`.
-    if (!isInitializeComplete) {
+    // 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()
+    }
+    if (!intp.isInitializeComplete) {
       intp.initializeSynchronous()
     }