archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8247995: Avoid use of a mapping function in Permissions.getPermissionCollection

Browse source 
Reviewed-by: rriggs
This commit is contained in:
Claes Redestad 2020-06-23 10:07:10 +02:00
parent 17f2250c5a
commit 8d9826e4d1
2 changed files with 115 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/java.base/share/classes/java/security/Permissions.java
View file

@ -32,7 +32,6 @@ import java.io.ObjectOutputStream;
import java.io.ObjectStreamField;
import java.io.Serializable;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
@ -230,38 +229,50 @@ implements Serializable
*/
private PermissionCollection getPermissionCollection(Permission p,
boolean createEmpty) {
Class<?> c = p.getClass();
if (!hasUnresolved && !createEmpty) {
return permsMap.get(c);
PermissionCollection pc = permsMap.get(p.getClass());
if ((!hasUnresolved && !createEmpty) || pc != null) {
// Collection not to be created, or already created
return pc;
}
return createPermissionCollection(p, createEmpty);
}
// Create and add permission collection to map if it is absent.
// NOTE: cannot use lambda for mappingFunction parameter until
// JDK-8076596 is fixed.
return permsMap.computeIfAbsent(c,
new java.util.function.Function<>() {
@Override
public PermissionCollection apply(Class<?> k) {
// Check for unresolved permissions
PermissionCollection pc =
(hasUnresolved ? getUnresolvedPermissions(p) : null);
private PermissionCollection createPermissionCollection(Permission p,
boolean createEmpty) {
synchronized (permsMap) {
// Re-read under lock
Class<?> c = p.getClass();
PermissionCollection pc = permsMap.get(c);
// if still null, create a new collection
if (pc == null && createEmpty) {
// Collection already created
if (pc != null) {
return pc;
}
pc = p.newPermissionCollection();
// Create and add permission collection to map if it is absent.
// Check for unresolved permissions
pc = (hasUnresolved ? getUnresolvedPermissions(p) : null);
// still no PermissionCollection?
// We'll give them a PermissionsHash.
if (pc == null) {
pc = new PermissionsHash();
}
}
return pc;
// if still null, create a new collection
if (pc == null && createEmpty) {
pc = p.newPermissionCollection();
// still no PermissionCollection?
// We'll give them a PermissionsHash.
if (pc == null) {
pc = new PermissionsHash();
}
}
);
if (pc != null) {
// Add pc, resolving any race
PermissionCollection oldPc = permsMap.putIfAbsent(c, pc);
if (oldPc != null) {
pc = oldPc;
}
}
return pc;
}
}
/**