address review comments

apache · May 16, 2017 · a5fd465 · a5fd465
1 parent 3868bf5
commit a5fd465
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala
@@ -373,9 +373,8 @@ abstract class SparkPlan extends QueryPlan[SparkPlan] with Logging with Serializ
     try {
       GeneratePredicate.generate(expression, inputSchema)
     } catch {
-      case e: JaninoRuntimeException if sqlContext == null || sqlContext.conf.wholeStageFallback =>
-        genInterpretedPredicate(expression, inputSchema)
-      case e: CompileException if sqlContext == null || sqlContext.conf.wholeStageFallback =>
+      case e @ (_: JaninoRuntimeException | _: CompileException)
+          if sqlContext == null || sqlContext.conf.wholeStageFallback =>
         genInterpretedPredicate(expression, inputSchema)
     }
   }