diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index d0b4e3ed881..1099a3984ef 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -430,6 +430,10 @@ Release 2.7.1 - UNRELEASED HADOOP-12078. The default retry policy does not handle RetriableException correctly. (Arpit Agarwal) + HADOOP-12100. ImmutableFsPermission should not override applyUmask since + that method doesn't modify the FsPermission (Bibin A Chundatt via Colin P. + McCabe) + Release 2.7.0 - 2015-04-20 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java index 264a0952706..0258293823e 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java @@ -375,13 +375,10 @@ private static class ImmutableFsPermission extends FsPermission { public ImmutableFsPermission(short permission) { super(permission); } - @Override - public FsPermission applyUMask(FsPermission umask) { - throw new UnsupportedOperationException(); - } + @Override public void readFields(DataInput in) throws IOException { throw new UnsupportedOperationException(); - } + } } }