svn commit: r1027316 - in /hadoop/common/trunk: CHANGES.txt src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java

[tomwhite]

Author: tomwhite
Date: Mon Oct 25 23:50:05 2010
New Revision: 1027316

URL: http://svn.apache.org/viewvc?rev=1027316&view=rev
Log:
Reverting HADOOP-6663.

Removed:
    
hadoop/common/trunk/src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java
Modified:
    hadoop/common/trunk/CHANGES.txt
    
hadoop/common/trunk/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java

Modified: hadoop/common/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1027316&r1=1027315&r2=1027316&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Mon Oct 25 23:50:05 2010
@@ -272,9 +272,6 @@ Trunk (unreleased changes)
 
     HADOOP-6933. TestListFiles is flaky. (Todd Lipcon via tomwhite)
 
-    HADOOP-6663.  BlockDecompressorStream get EOF exception when decompressing
-    the file compressed from empty file.  (Kang Xiao via tomwhite)
-
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: 
hadoop/common/trunk/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java?rev=1027316&r1=1027315&r2=1027316&view=diff
==============================================================================
--- 
hadoop/common/trunk/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
 (original)
+++ 
hadoop/common/trunk/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
 Mon Oct 25 23:50:05 2010
@@ -75,12 +75,6 @@ public class BlockDecompressorStream ext
         return -1;
       }
       noUncompressedBytes = 0;
-      // EOF if originalBlockSize is 0
-      // This will occur only when decompressing previous compressed empty file
-      if (originalBlockSize == 0) {
-        eof = true;
-        return -1;
-      }
     }
 
     int n = 0;