Author: cnauroth Date: Thu May 15 23:37:10 2014 New Revision: 1595076 URL: http://svn.apache.org/r1595076 Log: HDFS-6402. Merging change r1595071 from branch-2 to branch-2.4
Modified: hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FsAclPermission.java Modified: hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1595076&r1=1595075&r2=1595076&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu May 15 23:37:10 2014 @@ -77,6 +77,9 @@ Release 2.4.1 - UNRELEASED HDFS-6362. InvalidateBlocks is inconsistent in usage of DatanodeUuid and StorageID. (Arpit Agarwal) + HDFS-6402. Suppress findbugs warning for failure to override equals and + hashCode in FsAclPermission. (cnauroth) + Release 2.4.0 - 2014-04-07 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FsAclPermission.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FsAclPermission.java?rev=1595076&r1=1595075&r2=1595076&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FsAclPermission.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FsAclPermission.java Thu May 15 23:37:10 2014 @@ -60,4 +60,18 @@ public class FsAclPermission extends FsP public boolean getAclBit() { return aclBit; } + + @Override + public boolean equals(Object o) { + // This intentionally delegates to the base class. This is only overridden + // to suppress a FindBugs warning. + return super.equals(o); + } + + @Override + public int hashCode() { + // This intentionally delegates to the base class. This is only overridden + // to suppress a FindBugs warning. + return super.hashCode(); + } }