Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 42960 invoked from network); 23 Mar 2010 01:16:27 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Mar 2010 01:16:27 -0000 Received: (qmail 99636 invoked by uid 500); 23 Mar 2010 01:16:27 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 99610 invoked by uid 500); 23 Mar 2010 01:16:27 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 99603 invoked by uid 99); 23 Mar 2010 01:16:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Mar 2010 01:16:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Mar 2010 01:16:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E2682238897A; Tue, 23 Mar 2010 01:16:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r926421 - in /hadoop/common/trunk: CHANGES.txt src/java/org/apache/hadoop/fs/HarFileSystem.java Date: Tue, 23 Mar 2010 01:16:03 -0000 To: common-commits@hadoop.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100323011603.E2682238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mahadev Date: Tue Mar 23 01:16:03 2010 New Revision: 926421 URL: http://svn.apache.org/viewvc?rev=926421&view=rev Log: HADOOP-6645. Bugs on listStatus for HarFileSystem (rodrigo via mahadev) Modified: hadoop/common/trunk/CHANGES.txt hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java Modified: hadoop/common/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=926421&r1=926420&r2=926421&view=diff ============================================================================== --- hadoop/common/trunk/CHANGES.txt (original) +++ hadoop/common/trunk/CHANGES.txt Tue Mar 23 01:16:03 2010 @@ -293,6 +293,8 @@ Trunk (unreleased changes) HADOOP-6175. Incorrect version compilation with es_ES.ISO8859-15 locale on Solaris 10. (Urko Benito via tomwhite) + HADOOP-6645. Bugs on listStatus for HarFileSystem (rodrigo via mahadev) + Release 0.21.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java?rev=926421&r1=926420&r2=926421&view=diff ============================================================================== --- hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java (original) +++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java Tue Mar 23 01:16:03 2010 @@ -409,7 +409,7 @@ public class HarFileSystem extends Filte LineReader aLin; long read = 0; aLin = new LineReader(aIn, getConf()); - String parentString = parent.getName(); + String parentString = parent.getName() + Path.SEPARATOR; Path harPath = new Path(parentString); int harlen = harPath.depth(); Text line = new Text(); @@ -417,7 +417,7 @@ public class HarFileSystem extends Filte int tmp = aLin.readLine(line); read += tmp; String lineFeed = line.toString(); - String child = lineFeed.substring(0, lineFeed.indexOf(" ")); + String child = decodeFileName(lineFeed.substring(0, lineFeed.indexOf(" "))); if ((child.startsWith(parentString))) { Path thisPath = new Path(child); if (thisPath.depth() == harlen + 1) {