MAPREDUCE-3770. [Rumen] Zombie.getJobConf() results into NPE. Contributed by Amar Kamat.

svn merge --ignore-ancestry -c 1241845 ../../trunk/
Also cleand up CHANGES.txt a bit.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.1@1242897 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -5,6 +5,7 @@ Release 0.23.1 - 2012-02-08
   INCOMPATIBLE CHANGES
 
   NEW FEATURES
+
     MAPREDUCE-778. Rumen Anonymizer. (Amar Kamat and Chris Douglas via amarrk)
 
     MAPREDUCE-3121. NodeManager should handle disk-failures (Ravi Gummadi via mahadev)
@@ -18,6 +19,7 @@ Release 0.23.1 - 2012-02-08
     MAPREDUCE-778. Rumen Anonymizer. (Amar Kamat and Chris Douglas via amarrk)
 
   IMPROVEMENTS
+
     MAPREDUCE-3481. [Gridmix] Improve Gridmix STRESS mode. (amarrk)
 
     MAPREDUCE-3597. [Rumen] Rumen should provide APIs to access all the 
@@ -25,8 +27,6 @@ Release 0.23.1 - 2012-02-08
 
     MAPREDUCE-3375. [Gridmix] Memory Emulation system tests. 
                     (Vinay Thota via amarrk)
-  MAPREDUCE-3840.  JobEndNotifier doesn't use the proxyToUse during connecting
-  (Ravi Prakash via bobby)
 
     MAPREDUCE-2733. [Gridmix] Gridmix3 cpu emulation system tests. 
                     (Vinay Thota via amarrk)
@@ -203,6 +203,7 @@ Release 0.23.1 - 2012-02-08
     acmurthy) 
 
   BUG FIXES
+
     MAPREDUCE-3804. yarn webapp interface vulnerable to cross scripting attacks
     (Dave Thompson via bobby)
 
@@ -219,8 +220,7 @@ Release 0.23.1 - 2012-02-08
 
     MAPREDUCE-3412. Fix 'ant docs'. (amarrk)
 
-    MAPREDUCE-3346 [Rumen] LoggedTaskAttempt#getHostName() returns null.
-                   (amarrk)
+    MAPREDUCE-3346 [Rumen] LoggedTaskAttempt#getHostName() returns null. (amarrk)
 
     MAPREDUCE-3221. Reenabled the previously ignored test in TestSubmitJob
     and fixed bugs in it. (Devaraj K via vinodkv)
@@ -733,6 +733,11 @@ Release 0.23.1 - 2012-02-08
     MAPREDUCE-3828. Ensure that urls in single-node mode are correct. (sseth
     via acmurthy) 
 
+    MAPREDUCE-3770. Zombie.getJobConf() results into NPE. (amarrk)
+
+    MAPREDUCE-3840.  JobEndNotifier doesn't use the proxyToUse during connecting
+    (Ravi Prakash via bobby)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES

hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJob.java

@@ -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();