Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 22927 invoked from network); 23 Oct 2007 00:27:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Oct 2007 00:27:22 -0000 Received: (qmail 47906 invoked by uid 500); 23 Oct 2007 00:27:10 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 47794 invoked by uid 500); 23 Oct 2007 00:27:09 -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 47785 invoked by uid 99); 23 Oct 2007 00:27:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2007 17:27:09 -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, 23 Oct 2007 00:27:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A16721A9832; Mon, 22 Oct 2007 17:26:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r587329 - /lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java Date: Tue, 23 Oct 2007 00:26:31 -0000 To: hadoop-commits@lucene.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071023002631.A16721A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Mon Oct 22 17:26:30 2007 New Revision: 587329 URL: http://svn.apache.org/viewvc?rev=587329&view=rev Log: Merge -r 587325:587326 from trunk to branch 0.15. Part of HADOOP-2080. Modified: lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java Modified: lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java?rev=587329&r1=587328&r2=587329&view=diff ============================================================================== --- lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java (original) +++ lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java Mon Oct 22 17:26:30 2007 @@ -37,7 +37,7 @@ *****************************************************************/ public abstract class ChecksumFileSystem extends FilterFileSystem { private static final byte[] CHECKSUM_VERSION = new byte[] {'c', 'r', 'c', 0}; - private final int bytesPerChecksum; + private int bytesPerChecksum; public static double getApproxChkSumLength(long size) { return ChecksumFSOutputSummer.CHKSUM_AS_FRACTION * size; @@ -45,7 +45,13 @@ public ChecksumFileSystem(FileSystem fs) { super(fs); - bytesPerChecksum = getConf().getInt("io.bytes.per.checksum", 512); + } + + public void setConf(Configuration conf) { + super.setConf(conf); + if (conf != null) { + bytesPerChecksum = conf.getInt("io.bytes.per.checksum", 512); + } } /** get the raw file system */