Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: core-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r696534 - in /hadoop/core/trunk: CHANGES.txt
 src/core/org/apache/hadoop/io/SequenceFile.java
Date: Thu, 18 Sep 2008 02:00:56 -0000
To: core-commits@hadoop.apache.org
From: omalley@apache.org
Message-Id: <20080918020057.375AC238896F@eris.apache.org>

Author: omalley
Date: Wed Sep 17 19:00:56 2008
New Revision: 696534

URL: http://svn.apache.org/viewvc?rev=696534&view=rev
Log:
HADOOP-4195. Close compressor before returning to codec pool.
From: Arun Murthy <acmurthy@apache.org>

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/core/org/apache/hadoop/io/SequenceFile.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=696534&r1=696533&r2=696534&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Sep 17 19:00:56 2008
@@ -601,6 +601,9 @@
     the interfaces to the serializer and de-serializer.
     (Zheng Shao via dhruba)
 
+    HADOOP-4195. Close compressor before returning to codec pool.
+    (acmurthy via omalley)
+
 Release 0.18.1 - 2008-09-17
 
   IMPROVEMENTS

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/io/SequenceFile.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/io/SequenceFile.java?rev=696534&r1=696533&r2=696534&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/io/SequenceFile.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/io/SequenceFile.java Wed Sep 17 19:00:56 2008
@@ -943,15 +943,15 @@
     
     /** Close the file. */
     public synchronized void close() throws IOException {
-      CodecPool.returnCompressor(compressor);
-      compressor = null;
-      
       keySerializer.close();
       uncompressedValSerializer.close();
       if (compressedValSerializer != null) {
         compressedValSerializer.close();
       }
 
+      CodecPool.returnCompressor(compressor);
+      compressor = null;
+      
       if (out != null) {
         
         // Close the underlying stream iff we own it...