Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 97766 invoked from network); 17 Mar 2007 19:52:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Mar 2007 19:52:02 -0000 Received: (qmail 2213 invoked by uid 500); 17 Mar 2007 19:52:10 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 2197 invoked by uid 500); 17 Mar 2007 19:52:10 -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 2188 invoked by uid 99); 17 Mar 2007 19:52:10 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Mar 2007 12:52:10 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Sat, 17 Mar 2007 12:52:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7E8791A9838; Sat, 17 Mar 2007 12:51:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r519431 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/fs/ChecksumFileSystem.java src/java/org/apache/hadoop/fs/FSDataOutputStream.java Date: Sat, 17 Mar 2007 19:51:41 -0000 To: hadoop-commits@lucene.apache.org From: tomwhite@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070317195141.7E8791A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tomwhite Date: Sat Mar 17 12:51:40 2007 New Revision: 519431 URL: http://svn.apache.org/viewvc?view=rev&rev=519431 Log: HADOOP-1129. Fix DFSClient to not hide IOExceptions in flush method. Contributed by Hairong Kuang. Modified: lucene/hadoop/trunk/CHANGES.txt lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FSDataOutputStream.java Modified: lucene/hadoop/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=519431&r1=519430&r2=519431 ============================================================================== --- lucene/hadoop/trunk/CHANGES.txt (original) +++ lucene/hadoop/trunk/CHANGES.txt Sat Mar 17 12:51:40 2007 @@ -73,6 +73,9 @@ (Espen Amble Kolstad, Andrzej Bialecki, and Owen O'Malley via tomwhite) +22. HADOOP-1129. Fix DFSClient to not hide IOExceptions in + flush method. (Hairong Kuang via tomwhite) + Release 0.12.0 - 2007-03-02 Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java?view=diff&rev=519431&r1=519430&r2=519431 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java Sat Mar 17 12:51:40 2007 @@ -404,7 +404,7 @@ if(sums != null) { sums.close(); } - super.close(); + out.close(); } public static long getChecksumLength(long size, int bytesPerSum) { Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FSDataOutputStream.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FSDataOutputStream.java?view=diff&rev=519431&r1=519430&r2=519431 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FSDataOutputStream.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FSDataOutputStream.java Sat Mar 17 12:51:40 2007 @@ -43,6 +43,10 @@ return position; // return cached position } + public void close() throws IOException { + flush(); + out.close(); + } } private static class Buffer extends BufferedOutputStream { @@ -62,6 +66,11 @@ buf[count++] = (byte)b; } } + + public void close() throws IOException { + flush(); + out.close(); + } } public FSDataOutputStream(OutputStream out, int bufferSize) @@ -76,5 +85,10 @@ public long getPos() throws IOException { return ((Buffer)out).getPos(); + } + + public void close() throws IOException { + flush(); + out.close(); } }