HADOOP-1191. Merge -r 524902:524903 from trunk to 0.12 branch.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/branches/branch-0.12@524911 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -16,6 +16,9 @@ Release 0.12.3 (not yet released)
  4. HADOOP-1175.  Fix bugs in JSP for displaying a task's log messages.
     (Arun C Murthy via cutting)
 
+ 5. HADOOP-1191.  Fix map tasks to wait until sort progress thread has
+    stopped before reporting the task done.  (Devaraj Das via cutting)
+
 
 Release 0.12.2 - 2007-23-17
 

src/java/org/apache/hadoop/mapred/MapTask.java

@@ -186,6 +186,9 @@ class MapTask extends Task {
       in.close();                               // close input
       collector.close();
       sortProgress.interrupt();
+      try {
+        sortProgress.join();
+      } catch (InterruptedException ie){ }
     }
     done(umbilical);
   }