aboutsummaryrefslogtreecommitdiff
path: root/repl/scala-2.11
diff options
context:
space:
mode:
authorvinodkc <vinod.kc.in@gmail.com>2015-05-08 14:07:53 -0700
committerAndrew Or <andrew@databricks.com>2015-05-08 14:07:53 -0700
commit4e7360e12dc71c2391764e3596a7971b4d9d7bfc (patch)
treec3fea427c7d770b32c45bb0b5892d34c3554bcc4 /repl/scala-2.11
parentc45c09b015f6f1111fcf9e3c3109a253bbd1d259 (diff)
downloadspark-4e7360e12dc71c2391764e3596a7971b4d9d7bfc.tar.gz
spark-4e7360e12dc71c2391764e3596a7971b4d9d7bfc.tar.bz2
spark-4e7360e12dc71c2391764e3596a7971b4d9d7bfc.zip
[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 <vinod.kc.in@gmail.com> 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
Diffstat (limited to 'repl/scala-2.11')
-rw-r--r--repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala2
1 files changed, 1 insertions, 1 deletions
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 2210fbaafe..f4f4b62698 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..")
}