From 9e7725c86e70ffd3d2ff3a563460c2b7d0c9bbee Mon Sep 17 00:00:00 2001
From: GuoQiang Li <witgo@qq.com>
Date: Wed, 23 Jul 2014 22:50:39 -0700
Subject: [PATCH] SPARK-2662: Fix NPE for JsonProtocol
Author: GuoQiang Li <witgo@qq.com>
Closes #1511 from witgo/JsonProtocol and squashes the following commits:
2b6227f [GuoQiang Li] Fix NPE for JsonProtocol
---
core/src/main/scala/org/apache/spark/util/JsonProtocol.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 3448aaaf57..bb6079154a 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) ~
--
GitLab