Use a static synchronized method for allPermissionsPD

Since allPermissionsPD is a static field, a static synchronized method locks on Class.class, which is the correct approach for ensuring thread safety. Fixes: eclipse-openj9#20351 Signed-off-by: Babneet Singh <[email protected]>
babsingh · Feb 6, 2025 · bc98382 · bc98382
1 parent 516d0f5
commit bc98382
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/jcl/src/java.base/share/classes/java/lang/Class.java b/jcl/src/java.base/share/classes/java/lang/Class.java
@@ -2491,17 +2491,15 @@ ProtectionDomain getProtectionDomainInternal() {
 	return 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);
-		}
+/* Synchronization is added to ensure safe initialization and safe
+ * publication of allPermissionsPD. This addresses the locking contention
+ * on allPermissionsPD in getProtectionDomain().
+ */
+private static synchronized void allocateAllPermissionsPD() {
+	if (allPermissionsPD == null) {
+		Permissions collection = new Permissions();
+		collection.add(SecurityConstants.ALL_PERMISSION);
+		allPermissionsPD = new ProtectionDomain(null, collection);
 	}
 }