svn commit: r1104377 - in /hadoop/common/branches/branch-0.22: CHANGES.txt src/java/org/apache/hadoop/fs/permission/FsPermission.java src/test/core/org/apache/hadoop/fs/permission/TestFsPermission.java

[tomwhite]

Author: tomwhite
Date: Tue May 17 16:12:35 2011
New Revision: 1104377

URL: http://svn.apache.org/viewvc?rev=1104377&view=rev
Log:
Merge -r 1104373:1104374 from trunk to branch-0.22. Fixes: HADOOP-7296

Modified:
    hadoop/common/branches/branch-0.22/CHANGES.txt
    
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/permission/FsPermission.java
    
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/fs/permission/TestFsPermission.java

Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1104377&r1=1104376&r2=1104377&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Tue May 17 16:12:35 2011
@@ -471,6 +471,9 @@ Release 0.22.0 - Unreleased
 
     HADOOP-7291. Update Hudson job not to run test-contrib. (nigel via eli)
 
+    HADOOP-7296. The FsPermission(FsPermission) constructor does not use the
+    sticky bit. (Siddharth Seth via tomwhite)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: 
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/permission/FsPermission.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/permission/FsPermission.java?rev=1104377&r1=1104376&r2=1104377&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/permission/FsPermission.java
 (original)
+++ 
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/permission/FsPermission.java
 Tue May 17 16:12:35 2011
@@ -96,6 +96,7 @@ public class FsPermission implements Wri
     this.useraction = other.useraction;
     this.groupaction = other.groupaction;
     this.otheraction = other.otheraction;
+    this.stickyBit = other.stickyBit;
   }
   
   /**

Modified: 
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/fs/permission/TestFsPermission.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/fs/permission/TestFsPermission.java?rev=1104377&r1=1104376&r2=1104377&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/fs/permission/TestFsPermission.java
 (original)
+++ 
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/fs/permission/TestFsPermission.java
 Tue May 17 16:12:35 2011
@@ -66,6 +66,8 @@ public class TestFsPermission extends Te
           for(FsAction o : FsAction.values()) {
             FsPermission f = new FsPermission(u, g, o, sb);
             assertEquals(s, f.toShort());
+            FsPermission f2 = new FsPermission(f);
+            assertEquals(s, f2.toShort());
             s++;
           }
         }