hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1079104 - in /hadoop/common/branches/yahoo-merge: CHANGES.txt src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java
Date Tue, 08 Mar 2011 04:36:02 GMT
Author: omalley
Date: Tue Mar  8 04:36:01 2011
New Revision: 1079104

URL: http://svn.apache.org/viewvc?rev=1079104&view=rev
Log:
commit 51e74e7cb221e2f3c22d5221bf79d725bf6d90a5
Author: Thomas White <tomwhite@apache.org>
Date:   Mon Oct 25 23:50:05 2010 +0000

    Reverting HADOOP-6663.
    
    git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1027316 13f79535-47bb-0310-9956-ffa450edef68

Removed:
    hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java
Modified:
    hadoop/common/branches/yahoo-merge/CHANGES.txt
    hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java

Modified: hadoop/common/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/CHANGES.txt?rev=1079104&r1=1079103&r2=1079104&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/common/branches/yahoo-merge/CHANGES.txt Tue Mar  8 04:36:01 2011
@@ -274,9 +274,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/branches/yahoo-merge/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java?rev=1079104&r1=1079103&r2=1079104&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
(original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
Tue Mar  8 04:36:01 2011
@@ -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;



Mime
View raw message