浏览代码

HADOOP-4213. Fixes NPE in TestLimitTasksPerJobTaskScheduler. Contributed by Sreekanth Ramakrishnan.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@697063 13f79535-47bb-0310-9956-ffa450edef68
Devaraj Das 16 年之前
父节点
当前提交
95324758ea
共有 2 个文件被更改,包括 7 次插入1 次删除
  1. 3 0
      CHANGES.txt
  2. 4 1
      src/test/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java

+ 3 - 0
CHANGES.txt

@@ -660,6 +660,9 @@ Trunk (unreleased changes)
     HistoryViewer for JobHistory fails. (Amareshwari Sri Ramadasu via
     acmurthy) 
 
+    HADOOP-4213. Fixes NPE in TestLimitTasksPerJobTaskScheduler.
+    (Sreekanth Ramakrishnan via ddas)
+
 Release 0.18.1 - 2008-09-17
 
   IMPROVEMENTS

+ 4 - 1
src/test/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java

@@ -96,11 +96,14 @@ public class TestJobQueueTaskScheduler extends TestCase {
     int maxReduceTasksPerTracker = 2;
     List<JobInProgressListener> listeners =
       new ArrayList<JobInProgressListener>();
+    QueueManager queueManager;
     
     private Map<String, TaskTrackerStatus> trackers =
       new HashMap<String, TaskTrackerStatus>();
 
     public FakeTaskTrackerManager() {
+      JobConf conf = new JobConf();
+      queueManager = new QueueManager(conf);
       trackers.put("tt1", new TaskTrackerStatus("tt1", "tt1.host", 1,
           new ArrayList<TaskStatus>(), 0,
           maxMapTasksPerTracker, maxReduceTasksPerTracker));
@@ -141,7 +144,7 @@ public class TestJobQueueTaskScheduler extends TestCase {
     
     @Override
     public QueueManager getQueueManager() {
-      return null;
+      return queueManager;
     }
     
     @Override