svn commit: r1294904 - in /hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project: ./ hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/

[sseth]

Author: sseth
Date: Tue Feb 28 23:53:35 2012
New Revision: 1294904

URL: http://svn.apache.org/viewvc?rev=1294904&view=rev
Log:
merge MAPREDUCE-3930 from trunk

Modified:
    hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt
    
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java
    
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestConverterUtils.java

Modified: 
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt?rev=1294904&r1=1294903&r2=1294904&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt 
Tue Feb 28 23:53:35 2012
@@ -91,6 +91,10 @@ Release 0.23.2 - UNRELEASED
     MAPREDUCE-3816. capacity scheduler web ui bar graphs for used capacity 
wrong
     (tgraves via bobby)
 
+    MAPREDUCE-3930. Fixed an NPE while accessing the AM page/webservice for a 
+    task attempt without an assigned container. (Robert Joseph Evans via
+    sseth)
+
 Release 0.23.1 - 2012-02-17
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java?rev=1294904&r1=1294903&r2=1294904&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java
 (original)
+++ 
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java
 Tue Feb 28 23:53:35 2012
@@ -142,7 +142,7 @@ public class ConverterUtils {
   }
 
   public static String toString(ContainerId cId) {
-    return cId.toString();
+    return cId == null ? null : cId.toString();
   }
 
   public static NodeId toNodeId(String nodeIdStr) {

Modified: 
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestConverterUtils.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestConverterUtils.java?rev=1294904&r1=1294903&r2=1294904&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestConverterUtils.java
 (original)
+++ 
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestConverterUtils.java
 Tue Feb 28 23:53:35 2012
@@ -22,6 +22,7 @@ import static org.junit.Assert.*;
 import java.net.URISyntaxException;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.api.records.URL;
 import org.junit.Test;
 
@@ -35,4 +36,17 @@ public class TestConverterUtils {
     assertEquals(expectedPath, actualPath);
   }
 
+  @Test
+  public void testContainerId() throws URISyntaxException {
+    ContainerId id = BuilderUtils.newContainerId(0, 0, 0, 0);
+    String cid = ConverterUtils.toString(id);
+    assertEquals("container_0_0000_00_000000", cid);
+    ContainerId gen = ConverterUtils.toContainerId(cid);
+    assertEquals(gen, id);
+  }
+
+  @Test
+  public void testContainerIdNull() throws URISyntaxException {
+    assertNull(ConverterUtils.toString((ContainerId)null));
+  }  
 }