hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r570191 - in /lucene/hadoop/branches/branch-0.14: CHANGES.txt src/java/org/apache/hadoop/mapred/MapTask.java
Date Mon, 27 Aug 2007 17:35:39 GMT
Author: omalley
Date: Mon Aug 27 10:35:38 2007
New Revision: 570191

URL: http://svn.apache.org/viewvc?rev=570191&view=rev
Log:
Merge -r 570186 from the trunk to branch 0.14. Fixes HADOOP-1740.

Modified:
    lucene/hadoop/branches/branch-0.14/CHANGES.txt
    lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/MapTask.java

Modified: lucene/hadoop/branches/branch-0.14/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/CHANGES.txt?rev=570191&r1=570190&r2=570191&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.14/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.14/CHANGES.txt Mon Aug 27 10:35:38 2007
@@ -535,6 +535,8 @@
 159. HADOOP-1437.  Add Eclipse plugin in contrib.
      (Eugene Hung and Christophe Taton via cutting)
 
+160. HADOOP-1740.  Fix null pointer exception in sorting map outputs. (Devaraj
+     Das via omalley)
 
 Release 0.13.0 - 2007-06-08
 

Modified: lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/MapTask.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/MapTask.java?rev=570191&r1=570190&r2=570191&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/MapTask.java (original)
+++ lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/MapTask.java Mon
Aug 27 10:35:38 2007
@@ -589,8 +589,10 @@
       //check whether the length of the key/value buffer is 0. If not, then
       //we need to spill that to disk. Note that we reset the key/val buffer
       //upon each spill (so a length > 0 means that we have not spilled yet)
-      if (keyValBuffer.getLength() > 0) {
-        sortAndSpillToDisk();
+      synchronized (this) {
+        if (keyValBuffer != null && keyValBuffer.getLength() > 0) {
+          sortAndSpillToDisk();
+        }
       }
       mergeParts();
     }



Mime
View raw message