Author: cnauroth Date: Tue Jan 14 18:25:17 2014 New Revision: 1558146 URL: http://svn.apache.org/r1558146 Log: HADOOP-10228. Merging change r1557236 from trunk to branch-2.
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558146&r1=1558145&r2=1558146&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jan 14 18:25:17 2014 @@ -133,6 +133,9 @@ Release 2.4.0 - UNRELEASED HADOOP-10173. Remove UGI from DIGEST-MD5 SASL server creation (daryn via kihwal) + HADOOP-10228. FsPermission#fromShort() should cache FsAction.values(). + (Haohui Mai via cnauroth) + BUG FIXES HADOOP-9964. Fix deadlocks in TestHttpServer by synchronize Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java?rev=1558146&r1=1558145&r2=1558146&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java Tue Jan 14 18:25:17 2014 @@ -120,8 +120,7 @@ public class FsPermission implements Wri } public void fromShort(short n) { - FsAction[] v = FsAction.values(); - + FsAction[] v = FSACTION_VALUES; set(v[(n >>> 6) & 7], v[(n >>> 3) & 7], v[n & 7], (((n >>> 9) & 1) == 1) ); } @@ -210,6 +209,8 @@ public class FsPermission implements Wri public static final int DEFAULT_UMASK = CommonConfigurationKeys.FS_PERMISSIONS_UMASK_DEFAULT; + private static final FsAction[] FSACTION_VALUES = FsAction.values(); + /** * Get the user file creation mask (umask) *