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 ma...@apache.org on 2010/03/23 02:16:03 UTC

svn commit: r926421 - in /hadoop/common/trunk: CHANGES.txt src/java/org/apache/hadoop/fs/HarFileSystem.java

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) {