commit 03633b839e6af006b893dca05951b345065eff14
author Gopal V <gopalv@apache.org> Tue Jun 03 21:30:52 2014 -0700
committer Siddharth Seth <sseth@apache.org> Thu Jun 26 12:21:10 2014 -0700
tree 4e55405413a58630015f8652ec549016c6357658
parent f531ed55065fd567585aad9789b4c91e8885fab6

TEZ-1162. Fix CodecPool leaks in Shuffle (gopalv)

tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/ShuffleUtils.java

diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/ShuffleUtils.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/ShuffleUtils.java
index 0c7cb2e..2aadf09 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/ShuffleUtils.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/ShuffleUtils.java
@@ -82,9 +82,11 @@
 
     input = checksumIn;
 
+    Decompressor decompressor = null;
+    
     // Are map-outputs compressed?
     if (codec != null) {
-      Decompressor decompressor = CodecPool.getDecompressor(codec);
+      decompressor = CodecPool.getDecompressor(codec);
       decompressor.reset();
       input = codec.createInputStream(input, decompressor);
     }
@@ -101,6 +103,11 @@
       IOUtils.cleanup(LOG, input);
       // Re-throw
       throw ioe;
+    } finally {
+      if(decompressor != null) {
+        decompressor.reset();
+        CodecPool.returnDecompressor(decompressor);
+      }
     }
   }