提交 4e29d141 编写于 作者: A alanb

8005566: (fs) test/java/nio/file/Files/Misc.java failing (sol)

Reviewed-by: chegar
上级 8535ec12
...@@ -52,10 +52,10 @@ class SolarisAclFileAttributeView ...@@ -52,10 +52,10 @@ class SolarisAclFileAttributeView
/** /**
* typedef struct ace { * typedef struct ace {
* uid_t a_who; * uid_t a_who;
* uitn32_t a_access_mark; * uint32_t a_access_mask;
* uint16_t a_flags; * uint16_t a_flags;
* uint16_t a_type; * uint16_t a_type;
* } act_t; * } ace_t;
*/ */
private static final short SIZEOF_ACE_T = 12; private static final short SIZEOF_ACE_T = 12;
private static final short OFFSETOF_UID = 0; private static final short OFFSETOF_UID = 0;
...@@ -209,21 +209,16 @@ class SolarisAclFileAttributeView ...@@ -209,21 +209,16 @@ class SolarisAclFileAttributeView
// map uid and flags to UserPrincipal // map uid and flags to UserPrincipal
UnixUserPrincipals.User who = null; UnixUserPrincipals.User who = null;
if (uid == -1) { if ((flags & ACE_OWNER) > 0) {
if ((flags & ACE_OWNER) > 0) who = UnixUserPrincipals.SPECIAL_OWNER;
who = UnixUserPrincipals.SPECIAL_OWNER; } else if ((flags & ACE_GROUP) > 0) {
if ((flags & ACE_GROUP) > 0) who = UnixUserPrincipals.SPECIAL_GROUP;
who = UnixUserPrincipals.SPECIAL_GROUP; } else if ((flags & ACE_EVERYONE) > 0) {
if ((flags & ACE_EVERYONE) > 0) who = UnixUserPrincipals.SPECIAL_EVERYONE;
who = UnixUserPrincipals.SPECIAL_EVERYONE; } else if ((flags & ACE_IDENTIFIER_GROUP) > 0) {
if (who == null) who = UnixUserPrincipals.fromGid(uid);
throw new AssertionError("ACE who not handled");
} else { } else {
// can be gid who = UnixUserPrincipals.fromUid(uid);
if ((flags & ACE_IDENTIFIER_GROUP) > 0)
who = UnixUserPrincipals.fromGid(uid);
else
who = UnixUserPrincipals.fromUid(uid);
} }
AclEntryType aceType = null; AclEntryType aceType = null;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
*/ */
/* @test /* @test
* @bug 4313887 6838333 * @bug 4313887 6838333 8005566
* @summary Unit test for miscellenous methods in java.nio.file.Files * @summary Unit test for miscellenous methods in java.nio.file.Files
* @library .. * @library ..
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册