git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241845 13f79535-47bb-0310-9956-ffa450edef68
@@ -51,6 +51,8 @@ Trunk (unreleased changes)
MAPREDUCE-2944. Improve checking of input for JobClient.displayTasks() (XieXianshan via harsh)
BUG FIXES
+ MAPREDUCE-3770. Zombie.getJobConf() results into NPE. (amarrk)
+
MAPREDUCE-3804. yarn webapp interface vulnerable to cross scripting attacks
(Dave Thompson via bobby)
@@ -229,7 +229,7 @@ public class ZombieJob implements JobStory {
@Override
public String getName() {
JobName jobName = job.getJobName();
- if (jobName == null) {
+ if (jobName == null || jobName.getValue() == null) {
return "(name unknown)";
} else {
return jobName.getValue();