diff options
author | Patrick Wendell <patrick@databricks.com> | 2015-05-19 02:28:41 -0700 |
---|---|---|
committer | Patrick Wendell <patrick@databricks.com> | 2015-05-19 02:29:38 -0700 |
commit | 27fa88b9ba320cd0d95703aa3437151ba7c86f98 (patch) | |
tree | 900515e68d1db4b6f0e214e5fd96b4ff877c03c7 | |
parent | 61f164d3fdd1c8dcdba8c9d66df05ff4069aa6e6 (diff) | |
download | spark-27fa88b9ba320cd0d95703aa3437151ba7c86f98.tar.gz spark-27fa88b9ba320cd0d95703aa3437151ba7c86f98.tar.bz2 spark-27fa88b9ba320cd0d95703aa3437151ba7c86f98.zip |
[HOTFIX] Revert "[SPARK-7092] Update spark scala version to 2.11.6"
This reverts commit a11c8683c76c67f45749a1b50a0912a731fd2487.
For more information see:
https://issues.apache.org/jira/browse/SPARK-7726
-rw-r--r-- | pom.xml | 4 | ||||
-rw-r--r-- | repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1799,9 +1799,9 @@ <property><name>scala-2.11</name></property> </activation> <properties> - <scala.version>2.11.6</scala.version> + <scala.version>2.11.2</scala.version> <scala.binary.version>2.11</scala.binary.version> - <jline.version>2.12.1</jline.version> + <jline.version>2.12</jline.version> <jline.groupid>jline</jline.groupid> </properties> </profile> diff --git a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala index 1cb910f376..1bb62c84ab 100644 --- a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala +++ b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala @@ -1129,7 +1129,7 @@ class SparkIMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings def apply(line: String): Result = debugging(s"""parse("$line")""") { var isIncomplete = false - currentRun.parsing.withIncompleteHandler((_, _) => isIncomplete = true) { + currentRun.reporting.withIncompleteHandler((_, _) => isIncomplete = true) { reporter.reset() val trees = newUnitParser(line).parseStats() if (reporter.hasErrors) Error |