浏览代码

MAPREDUCE-3208. Fix NPE task/container log appenders. Contributed by liangzhwa.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1186542 13f79535-47bb-0310-9956-ffa450edef68
Arun Murthy 13 年之前
父节点
当前提交
7ca7fdadc4

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -1697,6 +1697,9 @@ Release 0.23.0 - Unreleased
 
     MAPREDUCE-2693. Fix NPE in job-blacklisting. (Hitesh Shah via acmurthy) 
 
+    MAPREDUCE-3208. Fix NPE task/container log appenders. (liangzhwa via
+    acmurthy) 
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

+ 3 - 1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLogAppender.java

@@ -93,7 +93,9 @@ public class TaskLogAppender extends FileAppender {
   }
   
   public void flush() {
-    qw.flush();
+    if (qw != null) {
+      qw.flush();
+    }
   }
 
   @Override

+ 3 - 1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java

@@ -65,7 +65,9 @@ public class ContainerLogAppender extends FileAppender {
   }
   
   public void flush() {
-    qw.flush();
+    if (qw != null) {
+      qw.flush();
+    }
   }
 
   @Override