diff options
| author | GuoQiang Li <witgo@qq.com> | 2014-07-23 22:50:39 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-07-23 22:50:39 -0700 |
| commit | 9e7725c86e70ffd3d2ff3a563460c2b7d0c9bbee (patch) | |
| tree | 072320a6e3e783b51f1f57f7588695dca5b15ff8 /core | |
| parent | 2d25e34814f81f288587f3277324cb655a5fb38d (diff) | |
| download | spark-9e7725c86e70ffd3d2ff3a563460c2b7d0c9bbee.tar.gz spark-9e7725c86e70ffd3d2ff3a563460c2b7d0c9bbee.tar.bz2 spark-9e7725c86e70ffd3d2ff3a563460c2b7d0c9bbee.zip | |
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
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/util/JsonProtocol.scala | 3 |
1 files changed, 2 insertions, 1 deletions
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) ~ |