HADOOP-10344. Fix TestAclCommands after merging HADOOP-10338 patch. Contributed by Chris Nauroth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1568026 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestAclCommands.java

@@ -187,6 +187,9 @@ public class TestAclCommands {
 
     @Override
     public FileStatus getFileStatus(Path f) throws IOException {
+      if (f.isRoot()) {
+        return new FileStatus(0, true, 0, 0, 0, f);
+      }
       return null;
     }
 

hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt

@@ -107,3 +107,6 @@ HDFS-4685 (Unreleased)
 
     HADOOP-10270. getfacl does not display effective permissions of masked
     entries. (cnauroth)
+
+    HADOOP-10344. Fix TestAclCommands after merging HADOOP-10338 patch.
+    (cnauroth)