Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 65313 invoked from network); 2 Oct 2007 18:40:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Oct 2007 18:40:00 -0000 Received: (qmail 40041 invoked by uid 500); 2 Oct 2007 18:39:50 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 40010 invoked by uid 500); 2 Oct 2007 18:39:50 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 40001 invoked by uid 99); 2 Oct 2007 18:39:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Oct 2007 11:39:50 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Oct 2007 18:40:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0365E1A9832; Tue, 2 Oct 2007 11:39:10 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r581343 - in /lucene/hadoop/branches/branch-0.14: CHANGES.txt src/java/org/apache/hadoop/io/compress/lzo/LzoCompressor.java Date: Tue, 02 Oct 2007 18:39:09 -0000 To: hadoop-commits@lucene.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071002183910.0365E1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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)