svn commit: r1294762 - in /hadoop/common/branches/HDFS-1623: ./ hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/ hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/

[atm]

Author: atm
Date: Tue Feb 28 18:33:41 2012
New Revision: 1294762

URL: http://svn.apache.org/viewvc?rev=1294762&view=rev
Log:
Merge trunk into HA branch.

Added:
    
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/OutputOnlyApp.java
      - copied unchanged from r1294758, 
hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/OutputOnlyApp.java
    
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUnconsumedInput.java
      - copied unchanged from r1294758, 
hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUnconsumedInput.java
Modified:
    hadoop/common/branches/HDFS-1623/   (props changed)
    
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java

Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 18:33:41 2012
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1294443
+/hadoop/common/trunk:1152502-1294758

Modified: 
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java?rev=1294762&r1=1294761&r2=1294762&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java
 (original)
+++ 
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java
 Tue Feb 28 18:33:41 2012
@@ -521,11 +521,15 @@ public abstract class PipeMapRed {
         LOG.info("mapRedFinished");
         return;
       }
-      try {
-        if (clientOut_ != null) {
+      if (clientOut_ != null) {
+        try {
           clientOut_.flush();
           clientOut_.close();
+        } catch (IOException io) {
+          LOG.warn(io);
         }
+      }
+      try {
         waitOutputThreads();
       } catch (IOException io) {
         LOG.warn(io);