Repository: hadoop Updated Branches: refs/heads/branch-3.0 4df200bc6 -> a5cb7f361
HADOOP-15289. FileStatus.readFields() assertion incorrect. Contributed by Steve Loughran. (cherry picked from commit 12ecb55ffee2b89108eea2565e7ad955ea1fabe7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a5cb7f36 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a5cb7f36 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a5cb7f36 Branch: refs/heads/branch-3.0 Commit: a5cb7f36161798ad9bf27802f0aaafa919131f98 Parents: 4df200b Author: Steve Loughran <ste...@apache.org> Authored: Tue Mar 6 10:08:28 2018 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Mar 6 10:08:28 2018 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/FileStatus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5cb7f36/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileStatus.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileStatus.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileStatus.java index 8575439..78312b3 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileStatus.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileStatus.java @@ -458,7 +458,7 @@ public class FileStatus implements Writable, Comparable<Object>, setSymlink((other.isSymlink() ? other.getSymlink() : null)); setPath(other.getPath()); attr = flags(other.hasAcl(), other.isEncrypted(), other.isErasureCoded()); - assert (isDirectory() && getSymlink() == null) || !isDirectory(); + assert !(isDirectory() && isSymlink()) : "A directory cannot be a symlink"; } /** --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
