aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMingfei <mingfei.shi@intel.com>2015-06-08 16:23:43 +0100
committerSean Owen <sowen@cloudera.com>2015-06-08 16:23:43 +0100
commit149d1b28e899177ed170292fd2af30aad5a610e0 (patch)
tree14cecde6e60ed10f38d632713fb7f738343e7391 /core
parente3e9c70384028cc0c322ccea14f19d3b6d6b39eb (diff)
downloadspark-149d1b28e899177ed170292fd2af30aad5a610e0.tar.gz
spark-149d1b28e899177ed170292fd2af30aad5a610e0.tar.bz2
spark-149d1b28e899177ed170292fd2af30aad5a610e0.zip
[SMALL FIX] Return null if catch EOFException
Return null if catch EOFException, just like function "asKeyValueIterator" in this class Author: Mingfei <mingfei.shi@intel.com> Closes #6703 from shimingfei/returnNull and squashes the following commits: 205deec [Mingfei] return null if catch EOFException
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/serializer/Serializer.scala1
1 files changed, 1 insertions, 0 deletions
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 f1bdff96d3..bd2704dc81 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
}
}