Repository: spark Updated Branches: refs/heads/master e3e9c7038 -> 149d1b28e
[SMALL FIX] Return null if catch EOFException Return null if catch EOFException, just like function "asKeyValueIterator" in this class Author: Mingfei <mingfei....@intel.com> Closes #6703 from shimingfei/returnNull and squashes the following commits: 205deec [Mingfei] return null if catch EOFException Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/149d1b28 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/149d1b28 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/149d1b28 Branch: refs/heads/master Commit: 149d1b28e899177ed170292fd2af30aad5a610e0 Parents: e3e9c70 Author: Mingfei <mingfei....@intel.com> Authored: Mon Jun 8 16:23:43 2015 +0100 Committer: Sean Owen <so...@cloudera.com> Committed: Mon Jun 8 16:23:43 2015 +0100 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/serializer/Serializer.scala | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/149d1b28/core/src/main/scala/org/apache/spark/serializer/Serializer.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/serializer/Serializer.scala b/core/src/main/scala/org/apache/spark/serializer/Serializer.scala index f1bdff9..bd2704d 100644 --- a/core/src/main/scala/org/apache/spark/serializer/Serializer.scala +++ b/core/src/main/scala/org/apache/spark/serializer/Serializer.scala @@ -182,6 +182,7 @@ abstract class DeserializationStream { } catch { case eof: EOFException => finished = true + null } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org