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 dh...@apache.org on 2007/12/21 00:59:31 UTC

svn commit: r606058 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/fs/RawLocalFileSystem.java

Author: dhruba
Date: Thu Dec 20 15:59:26 2007
New Revision: 606058

URL: http://svn.apache.org/viewvc?rev=606058&view=rev
Log:
HADOOP-2476. Unit test failure while reading permission bits of local
file system (on Windows) fixed.  (Raghu Angadi via dhruba)


Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=606058&r1=606057&r2=606058&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Thu Dec 20 15:59:26 2007
@@ -273,6 +273,9 @@
     HADOOP-2352. Remove AC_CHECK_LIB for libz and liblzo to ensure that
     libhadoop.so doesn't have a dependency on them. (acmurthy) 
 
+    HADOOP-2476. Unit test failure while reading permission bits of local
+    file system (on Windows) fixed.  (Raghu Angadi via dhruba)
+
 Branch 0.15 (unreleased)
 
   BUG FIXES

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java?rev=606058&r1=606057&r2=606058&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java Thu Dec 20 15:59:26 2007
@@ -402,7 +402,11 @@
                         ShellCommand.getGET_PERMISSION_COMMAND()));
         //expected format
         //-rw-------    1 username groupname ...
-        setPermission(FsPermission.valueOf(t.nextToken()));
+        String permission = t.nextToken();
+        if (permission.length() > 10) { //files with ACLs might have a '+'
+          permission = permission.substring(0, 10);
+        }
+        setPermission(FsPermission.valueOf(permission));
         t.nextToken();
         setOwner(t.nextToken());
         setGroup(t.nextToken());