From c56916f58296fe64312a3060ba88e5f0e2db429c Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Wed, 19 Oct 2011 22:38:53 +0000 Subject: [PATCH] Merge -c 1186542 from trunk to branch-0.23 to complete fix for MAPREDUCE-3208. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186544 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/mapred/TaskLogAppender.java | 4 +++- .../java/org/apache/hadoop/yarn/ContainerLogAppender.java | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index b5290243fa6..c1f3532af0c 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -1643,6 +1643,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 diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLogAppender.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLogAppender.java index d60b64a4097..0b79837f62d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLogAppender.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLogAppender.java @@ -93,7 +93,9 @@ public void append(LoggingEvent event) { } public void flush() { - qw.flush(); + if (qw != null) { + qw.flush(); + } } @Override diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java index ac4a61f934f..7f09c175b6b 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java @@ -65,7 +65,9 @@ public void append(LoggingEvent event) { } public void flush() { - qw.flush(); + if (qw != null) { + qw.flush(); + } } @Override