From 92b83959cacbc902ff0b50110261f097bf2df247 Mon Sep 17 00:00:00 2001
From: Michael Armbrust <michael@databricks.com>
Date: Sat, 29 Mar 2014 22:01:29 -0700
Subject: [PATCH] Don't swallow all kryo errors, only those that indicate we
are out of data.
Author: Michael Armbrust <michael@databricks.com>
Closes #142 from marmbrus/kryoErrors and squashes the following commits:
9c72d1f [Michael Armbrust] Make the test more future proof.
78f5a42 [Michael Armbrust] Don't swallow all kryo errors, only those that indicate we are out of data.
---
.../scala/org/apache/spark/serializer/KryoSerializer.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala
index 6b6d814c1f..926e71573b 100644
--- a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala
+++ b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala
@@ -107,7 +107,8 @@ class KryoDeserializationStream(kryo: Kryo, inStream: InputStream) extends Deser
kryo.readClassAndObject(input).asInstanceOf[T]
} catch {
// DeserializationStream uses the EOF exception to indicate stopping condition.
- case _: KryoException => throw new EOFException
+ case e: KryoException if e.getMessage.toLowerCase.contains("buffer underflow") =>
+ throw new EOFException
}
}
--
GitLab