svn commit: r1101357 - in /hadoop/mapreduce/branches/MR-279: CHANGES.txt mr-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestUberAM.java

[sharad]

Author: sharad
Date: Tue May 10 08:08:21 2011
New Revision: 1101357

URL: http://svn.apache.org/viewvc?rev=1101357&view=rev
Log:
Fix Null Pointer in TestUberAM.

Modified:
    hadoop/mapreduce/branches/MR-279/CHANGES.txt
    
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestUberAM.java

Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1101357&r1=1101356&r2=1101357&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Tue May 10 08:08:21 2011
@@ -3,6 +3,8 @@ Hadoop MapReduce Change Log
 Trunk (unreleased changes)
 
   MAPREDUCE-279
+    Fix Null Pointer in TestUberAM. (sharad) 
+
     Fix refreshProxy in ClientServiceDelegate. (sharad)
 
     Client reconnect to restarted AM. (sharad)

Modified: 
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestUberAM.java
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestUberAM.java?rev=1101357&r1=1101356&r2=1101357&view=diff
==============================================================================
--- 
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestUberAM.java
 (original)
+++ 
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestUberAM.java
 Tue May 10 08:08:21 2011
@@ -64,13 +64,17 @@ public class TestUberAM extends TestMRJo
   @BeforeClass
   public static void setup() {
     TestMRJobs.setup();
-    mrCluster.getConfig().setBoolean(MRJobConfig.JOB_UBERTASK_ENABLE, true);
+    if (mrCluster != null) {
+       mrCluster.getConfig().setBoolean(MRJobConfig.JOB_UBERTASK_ENABLE, true);
+    }
   }
 
   @Override
   public void testSleepJob()
   throws IOException, InterruptedException, ClassNotFoundException {
-    mrCluster.getConfig().setInt("TestMRJobs.testSleepJob.reduces", 1);
+    if (mrCluster != null) {
+       mrCluster.getConfig().setInt("TestMRJobs.testSleepJob.reduces", 1);
+    }
     super.testSleepJob();
   }