You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2007/10/02 20:39:09 UTC
svn commit: r581343 - in /lucene/hadoop/branches/branch-0.14: CHANGES.txt
src/java/org/apache/hadoop/io/compress/lzo/LzoCompressor.java
Author: omalley
Date: Tue Oct 2 11:39:08 2007
New Revision: 581343
URL: http://svn.apache.org/viewvc?rev=581343&view=rev
Log:
Merge -r 581341:581342 from trunk to 0.14. Fixes HADOOP-1972.
Modified:
lucene/hadoop/branches/branch-0.14/CHANGES.txt
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/io/compress/lzo/LzoCompressor.java
Modified: lucene/hadoop/branches/branch-0.14/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/CHANGES.txt?rev=581343&r1=581342&r2=581343&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.14/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.14/CHANGES.txt Tue Oct 2 11:39:08 2007
@@ -14,6 +14,9 @@
HADOOP-1977. Fixed handling of ToolBase cli options in JobClient.
(enis via omalley)
+ HADOOP-1972. Fix LzoCompressor to ensure the user has actually asked
+ to finish compression. (arun via omalley)
+
Release 0.14.1 - 2007-09-04
BUG FIXES
Modified: lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/io/compress/lzo/LzoCompressor.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/io/compress/lzo/LzoCompressor.java?rev=581343&r1=581342&r2=581343&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/io/compress/lzo/LzoCompressor.java (original)
+++ lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/io/compress/lzo/LzoCompressor.java Tue Oct 2 11:39:08 2007
@@ -256,7 +256,7 @@
public synchronized boolean finished() {
// Check if 'lzo' says its 'finished' and
// all compressed data has been consumed
- return (finished && compressedDirectBuf.remaining() == 0);
+ return (finish && finished && compressedDirectBuf.remaining() == 0);
}
public synchronized int compress(byte[] b, int off, int len)