NonFatal

Author: Andrew Or

core/src/main/scala/org/apache/spark/serializer/SerializationDebugger.scala

@@ -23,6 +23,7 @@ import java.security.AccessController
 
 import scala.annotation.tailrec
 import scala.collection.mutable
+import scala.util.control.NonFatal
 
 import org.apache.spark.Logging
 
@@ -39,9 +40,9 @@ private[serializer] object SerializationDebugger extends Logging {
         new NotSerializableException(
           e.getMessage + "\nSerialization stack:\n" + find(obj).map("\t- " + _).mkString("\n"))
       } catch {
-        case e2: Exception =>
+        case NonFatal(t) =>
           // Fall back to old exception
-          logWarning("Exception in serialization debugger", e2)
+          logWarning("Exception in serialization debugger", t)
           e
       }
     } else {