You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2007/05/16 18:20:48 UTC

svn commit: r538641 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/mapred/TaskLogAppender.java

Author: tomwhite
Date: Wed May 16 09:20:48 2007
New Revision: 538641

URL: http://svn.apache.org/viewvc?view=rev&rev=538641
Log:
HADOOP-1355.  Fix null pointer dereference in TaskLogAppender.append(LoggingEvent).  Contributed by Arun C Murthy.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLogAppender.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=538641&r1=538640&r2=538641
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed May 16 09:20:48 2007
@@ -18,6 +18,9 @@
      to be the same as the replication factor of the original file.
      (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)
 

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLogAppender.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLogAppender.java?view=diff&rev=538641&r1=538640&r2=538641
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLogAppender.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLogAppender.java Wed May 16 09:20:48 2007
@@ -43,6 +43,7 @@
     if (this.layout == null) {
       errorHandler.error("No layout for appender " + name , 
                          null, ErrorCode.MISSING_LAYOUT);
+      return;
     }
     
     // Log the message to the task's log