diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2015-05-19 12:14:48 -0700 |
|---|---|---|
| committer | Patrick Wendell <patrick@databricks.com> | 2015-05-19 12:14:55 -0700 |
| commit | ee012e0ed61fbf5bb819b7489a3a23a03c878f4d (patch) | |
| tree | bd6362a26f0c78e1bcbe6f9e320e3dc74727ddcd /repl | |
| parent | cd3093e705b184df1291cd8f03331a9618993693 (diff) | |
| download | spark-ee012e0ed61fbf5bb819b7489a3a23a03c878f4d.tar.gz spark-ee012e0ed61fbf5bb819b7489a3a23a03c878f4d.tar.bz2 spark-ee012e0ed61fbf5bb819b7489a3a23a03c878f4d.zip | |
[SPARK-7726] Fix Scaladoc false errors
Visibility rules for static members are different in Scala and Java, and this case requires an explicit static import. Even though these are Java files, they are run through scaladoc, which enforces Scala rules.
Also reverted the commit that reverts the upgrade to 2.11.6
Author: Iulian Dragos <jaguarul@gmail.com>
Closes #6260 from dragos/issue/scaladoc-false-error and squashes the following commits:
f2e998e [Iulian Dragos] Revert "[HOTFIX] Revert "[SPARK-7092] Update spark scala version to 2.11.6""
0bad052 [Iulian Dragos] Fix scaladoc faux-error.
(cherry picked from commit 3c4c1f96474b3e66fa1d44ac0177f548cf5a3a10)
Signed-off-by: Patrick Wendell <patrick@databricks.com>
Diffstat (limited to 'repl')
| -rw-r--r-- | repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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 1bb62c84ab..1cb910f376 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.reporting.withIncompleteHandler((_, _) => isIncomplete = true) { + currentRun.parsing.withIncompleteHandler((_, _) => isIncomplete = true) { reporter.reset() val trees = newUnitParser(line).parseStats() if (reporter.hasErrors) Error |