Merge
diff --git a/src/share/classes/java/util/jar/JarVerifier.java b/src/share/classes/java/util/jar/JarVerifier.java
index 5495441..099cf7a 100644
--- a/src/share/classes/java/util/jar/JarVerifier.java
+++ b/src/share/classes/java/util/jar/JarVerifier.java
@@ -293,10 +293,8 @@
}
sfv.process(sigFileSigners);
- } catch (sun.security.pkcs.ParsingException pe) {
- if (debug != null) debug.println("processEntry caught: "+pe);
- // ignore and treat as unsigned
} catch (IOException ioe) {
+ // e.g. sun.security.pkcs.ParsingException
if (debug != null) debug.println("processEntry caught: "+ioe);
// ignore and treat as unsigned
} catch (SignatureException se) {
diff --git a/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java b/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
index c576f96..202efda 100644
--- a/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
+++ b/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
@@ -104,11 +104,11 @@
int uid;
if (user.isSpecial()) {
uid = -1;
- if (who.getName().equals(UnixUserPrincipals.SPECIAL_OWNER.getName()))
+ if (who == UnixUserPrincipals.SPECIAL_OWNER)
flags |= ACE_OWNER;
- else if (who.getName().equals(UnixUserPrincipals.SPECIAL_GROUP.getName()))
- flags |= ACE_GROUP;
- else if (who.getName().equals(UnixUserPrincipals.SPECIAL_EVERYONE.getName()))
+ else if (who == UnixUserPrincipals.SPECIAL_GROUP)
+ flags |= (ACE_GROUP | ACE_IDENTIFIER_GROUP);
+ else if (who == UnixUserPrincipals.SPECIAL_EVERYONE)
flags |= ACE_EVERYONE;
else
throw new AssertionError("Unable to map special identifier");
@@ -281,7 +281,7 @@
aceFlags.add(AclEntryFlag.DIRECTORY_INHERIT);
if ((flags & ACE_NO_PROPAGATE_INHERIT_ACE) > 0)
aceFlags.add(AclEntryFlag.NO_PROPAGATE_INHERIT);
- if ((flags & ACE_INHERIT_ONLY_ACE ) > 0)
+ if ((flags & ACE_INHERIT_ONLY_ACE) > 0)
aceFlags.add(AclEntryFlag.INHERIT_ONLY);
// build the ACL entry and add it to the list
diff --git a/test/java/nio/file/attribute/AclFileAttributeView/Basic.java b/test/java/nio/file/attribute/AclFileAttributeView/Basic.java
index 1456320..3b8a8bc2 100644
--- a/test/java/nio/file/attribute/AclFileAttributeView/Basic.java
+++ b/test/java/nio/file/attribute/AclFileAttributeView/Basic.java
@@ -22,7 +22,7 @@
*/
/* @test
- * @bug 4313887 6838333
+ * @bug 4313887 6838333 6891404
* @summary Unit test for java.nio.file.attribute.AclFileAttribueView
* @library ../..
*/