Merge -r 754926:754927 from trunk onto 0.20 branch. Fixes HADOOP-5493.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@754929 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -725,6 +725,9 @@ Release 0.20.0 - Unreleased
     HADOOP-5490. Fixes a synchronization problem in the EagerTaskInitializationListener
     class. (Jothi Padmanabhan via ddas)
 
+    HADOOP-5493. The shuffle copier threads return the codecs back to the pool when the
+    shuffle completes. (Jothi Padmanabhan via ddas)
+
 Release 0.19.2 - Unreleased
 
   BUG FIXES

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

@@ -1214,7 +1214,7 @@ class ReduceTask extends Task {
               finish(size);
             }
           } catch (InterruptedException e) { 
-            return; // ALL DONE
+            break; // ALL DONE
           } catch (FSError e) {
             LOG.error("Task: " + reduceTask.getTaskID() + " - FSError: " + 
                       StringUtils.stringifyException(e));
@@ -1229,6 +1229,11 @@ class ReduceTask extends Task {
                       StringUtils.stringifyException(th));
           }
         }
+        
+        if (decompressor != null) {
+          CodecPool.returnDecompressor(decompressor);
+        }
+          
       }
       
       /** Copies a a map output from a remote host, via HTTP.