Browse Source

HADOOP-1355. Fix null pointer dereference in TaskLogAppender.append(LoggingEvent). Contributed by Arun C Murthy.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@538641 13f79535-47bb-0310-9956-ffa450edef68
Thomas White 18 năm trước cách đây
mục cha
commit
41ab46bea5

+ 3 - 0
CHANGES.txt

@@ -18,6 +18,9 @@ Trunk (unreleased changes)
      to be the same as the replication factor of the original file.
      to be the same as the replication factor of the original file.
      (Dhruba Borthakur via tomwhite.)
      (Dhruba Borthakur via tomwhite.)
 
 
+  6. HADOOP-1355.  Fix null pointer dereference in 
+     TaskLogAppender.append(LoggingEvent).  (Arun C Murthy via tomwhite.)
+
 
 
 Branch 0.13 (unreleased changes)
 Branch 0.13 (unreleased changes)
 
 

+ 1 - 0
src/java/org/apache/hadoop/mapred/TaskLogAppender.java

@@ -43,6 +43,7 @@ public class TaskLogAppender extends AppenderSkeleton {
     if (this.layout == null) {
     if (this.layout == null) {
       errorHandler.error("No layout for appender " + name , 
       errorHandler.error("No layout for appender " + name , 
                          null, ErrorCode.MISSING_LAYOUT);
                          null, ErrorCode.MISSING_LAYOUT);
+      return;
     }
     }
     
     
     // Log the message to the task's log
     // Log the message to the task's log