Also expect NoClassDefFoundError

Andrew Or · Andrew Or · commit 61147e65244c · 2015-05-07T19:56:12.000-07:00
diff --git a/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala
@@ -1028,7 +1028,7 @@ class SparkILoop(
       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..")
     }

Original file line number	Diff line number	Diff line change
`@@ -1028,7 +1028,7 @@ class SparkILoop(`
`1028`	`1028`	`logInfo("Created sql context (with Hive support)..")`
`1029`	`1029`	`}`
`1030`	`1030`	`catch {`
`1031`		`- case cnf: java.lang.ClassNotFoundException =>`
	`1031`	`+ case _: java.lang.ClassNotFoundException \| _: java.lang.NoClassDefFoundError =>`
`1032`	`1032`	`sqlContext = new SQLContext(sparkContext)`
`1033`	`1033`	`logInfo("Created sql context..")`
`1034`	`1034`	`}`