Author: cnauroth Date: Sat Feb 1 05:55:20 2014 New Revision: 1563374 URL: http://svn.apache.org/r1563374 Log: HDFS-5860. Refactor INodeDirectory getDirectoryXFeature methods to use common getFeature helper method. Contributed by Jing Zhao.
Modified: hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java Modified: hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt?rev=1563374&r1=1563373&r2=1563374&view=diff ============================================================================== --- hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt (original) +++ hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt Sat Feb 1 05:55:20 2014 @@ -56,6 +56,9 @@ HDFS-4685 (Unreleased) HDFS-5858. Refactor common ACL test cases to be run through multiple FileSystem implementations. (cnauroth) + HDFS-5860. Refactor INodeDirectory getDirectoryXFeature methods to use + common getFeature helper method. (Jing Zhao via cnauroth) + OPTIMIZATIONS BUG FIXES Modified: hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java?rev=1563374&r1=1563373&r2=1563374&view=diff ============================================================================== --- hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java (original) +++ hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java Sat Feb 1 05:55:20 2014 @@ -146,12 +146,7 @@ public class INodeDirectory extends INod * otherwise, return null. */ public final DirectoryWithQuotaFeature getDirectoryWithQuotaFeature() { - for (Feature f : features) { - if (f instanceof DirectoryWithQuotaFeature) { - return (DirectoryWithQuotaFeature)f; - } - } - return null; + return getFeature(DirectoryWithQuotaFeature.class); } /** Is this directory with quota? */ @@ -186,12 +181,7 @@ public class INodeDirectory extends INod * otherwise, return null. */ public final DirectoryWithSnapshotFeature getDirectoryWithSnapshotFeature() { - for (Feature f : features) { - if (f instanceof DirectoryWithSnapshotFeature) { - return (DirectoryWithSnapshotFeature) f; - } - } - return null; + return getFeature(DirectoryWithSnapshotFeature.class); } /** Is this file has the snapshot feature? */