Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use a nested holder class to store allPermissionsPD #21077

Merged
merged 1 commit into from
Feb 6, 2025
Merged

Use a nested holder class to store allPermissionsPD #21077

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions jcl/src/java.base/share/classes/java/lang/Class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,6 @@ public final class Class<T> implements java.io.Serializable, GenericDeclaration,
private static final int ENUM = 0x4000;
private static final int MEMBER_INVALID_TYPE = -1;

private static volatile ProtectionDomain allPermissionsPD;

/*[IF]*/
/**
* It is important that these remain static final
Expand Down Expand Up @@ -2485,23 +2483,16 @@ ProtectionDomain getProtectionDomainInternal() {
if (result != null) {
return result;
}
if (allPermissionsPD == null) {
allocateAllPermissionsPD();
}
return allPermissionsPD;
return AllPermissionsPDHolder.allPermissionsPD;
}

private void allocateAllPermissionsPD() {
/* Synchronization to ensure safe initialization and safe publication of
* allPermissionsPD. This addresses the locking contention on allPermissionsPD
* in getProtectionDomain().
*/
synchronized(this) {
if (allPermissionsPD == null) {
Permissions collection = new Permissions();
collection.add(SecurityConstants.ALL_PERMISSION);
allPermissionsPD = new ProtectionDomain(null, collection);
}
private static final class AllPermissionsPDHolder {
static final ProtectionDomain allPermissionsPD;
private AllPermissionsPDHolder() {}
static {
Permissions collection = new Permissions();
collection.add(SecurityConstants.ALL_PERMISSION);
allPermissionsPD = new ProtectionDomain(null, collection);
}
}

Expand Down