You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/07/24 07:50:42 UTC
git commit: SPARK-2662: Fix NPE for JsonProtocol
Repository: spark
Updated Branches:
refs/heads/master 2d25e3481 -> 9e7725c86
SPARK-2662: Fix NPE for JsonProtocol
Author: GuoQiang Li <wi...@qq.com>
Closes #1511 from witgo/JsonProtocol and squashes the following commits:
2b6227f [GuoQiang Li] Fix NPE for JsonProtocol
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9e7725c8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9e7725c8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9e7725c8
Branch: refs/heads/master
Commit: 9e7725c86e70ffd3d2ff3a563460c2b7d0c9bbee
Parents: 2d25e34
Author: GuoQiang Li <wi...@qq.com>
Authored: Wed Jul 23 22:50:39 2014 -0700
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Wed Jul 23 22:50:39 2014 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/util/JsonProtocol.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/9e7725c8/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala b/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala
index 3448aaa..bb60791 100644
--- a/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala
+++ b/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala
@@ -257,7 +257,8 @@ private[spark] object JsonProtocol {
val reason = Utils.getFormattedClassName(taskEndReason)
val json = taskEndReason match {
case fetchFailed: FetchFailed =>
- val blockManagerAddress = blockManagerIdToJson(fetchFailed.bmAddress)
+ val blockManagerAddress = Option(fetchFailed.bmAddress).
+ map(blockManagerIdToJson).getOrElse(JNothing)
("Block Manager Address" -> blockManagerAddress) ~
("Shuffle ID" -> fetchFailed.shuffleId) ~
("Map ID" -> fetchFailed.mapId) ~