stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: chegar
This commit is contained in:
Alan Bateman 2013-01-11 12:27:57 +00:00
parent 3dfc6b7512
commit 36e2ef2ba8
2 changed files with 12 additions and 17 deletions
jdk
src/solaris/classes/sun/nio/fs
SolarisAclFileAttributeView.java
test/java/nio/file/Files
Misc.java

27
jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java

@ -52,10 +52,10 @@ class SolarisAclFileAttributeView
/**
* typedef struct ace {
* uid_t a_who;
* uitn32_t a_access_mark;
* uint32_t a_access_mask;
* uint16_t a_flags;
* uint16_t a_type;
* } act_t;
* } ace_t;
*/
private static final short SIZEOF_ACE_T = 12;
private static final short OFFSETOF_UID = 0;
@ -209,21 +209,16 @@ class SolarisAclFileAttributeView
// map uid and flags to UserPrincipal
UnixUserPrincipals.User who = null;
if (uid == -1) {
if ((flags & ACE_OWNER) > 0)
who = UnixUserPrincipals.SPECIAL_OWNER;
if ((flags & ACE_GROUP) > 0)
who = UnixUserPrincipals.SPECIAL_GROUP;
if ((flags & ACE_EVERYONE) > 0)
who = UnixUserPrincipals.SPECIAL_EVERYONE;
if (who == null)
throw new AssertionError("ACE who not handled");
if ((flags & ACE_OWNER) > 0) {
who = UnixUserPrincipals.SPECIAL_OWNER;
} else if ((flags & ACE_GROUP) > 0) {
who = UnixUserPrincipals.SPECIAL_GROUP;
} else if ((flags & ACE_EVERYONE) > 0) {
who = UnixUserPrincipals.SPECIAL_EVERYONE;
} else if ((flags & ACE_IDENTIFIER_GROUP) > 0) {
who = UnixUserPrincipals.fromGid(uid);
} else {
// can be gid
if ((flags & ACE_IDENTIFIER_GROUP) > 0)
who = UnixUserPrincipals.fromGid(uid);
else
who = UnixUserPrincipals.fromUid(uid);
who = UnixUserPrincipals.fromUid(uid);
}
AclEntryType aceType = null;

2
jdk/test/java/nio/file/Files/Misc.java

@ -22,7 +22,7 @@
*/
/* @test
* @bug 4313887 6838333
* @bug 4313887 6838333 8005566
* @summary Unit test for miscellenous methods in java.nio.file.Files
* @library ..
*/