Repository: spark Updated Branches: refs/heads/branch-1.4 1dde3b36b -> 3b7fb7aaa
[SPARK-7489] [SPARK SHELL] Spark shell crashes when compiled with scala 2.11 Spark shell crashes when compiled with scala 2.11 and SPARK_PREPEND_CLASSES=true There is a similar Resolved JIRA issue -SPARK-7470 and a PR https://github.com/apache/spark/pull/5997 , which handled same issue only in scala 2.10 Author: vinodkc <[email protected]> Closes #6013 from vinodkc/fix_sqlcontext_exception_scala_2.11 and squashes the following commits: 119061c [vinodkc] Spark shell crashes when compiled with scala 2.11 (cherry picked from commit 4e7360e12dc71c2391764e3596a7971b4d9d7bfc) Signed-off-by: Andrew Or <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3b7fb7aa Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3b7fb7aa Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3b7fb7aa Branch: refs/heads/branch-1.4 Commit: 3b7fb7aaad7496b8600b9fcae6cb978046c495a2 Parents: 1dde3b3 Author: vinodkc <[email protected]> Authored: Fri May 8 14:07:53 2015 -0700 Committer: Andrew Or <[email protected]> Committed: Fri May 8 14:08:00 2015 -0700 ---------------------------------------------------------------------- repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/3b7fb7aa/repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala ---------------------------------------------------------------------- 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 2210fba..f4f4b62 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 @@ -88,7 +88,7 @@ object Main extends Logging { logInfo("Created sql context (with Hive support)..") } catch { - case cnf: java.lang.ClassNotFoundException => + case _: java.lang.ClassNotFoundException | _: java.lang.NoClassDefFoundError => sqlContext = new SQLContext(sparkContext) logInfo("Created sql context..") } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
