From 80810b548621c1ccd1fbdfb31dae8d18a137086c Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun.wang@oracle.com>
Date: Tue, 5 Mar 2024 14:49:49 -0500
Subject: [PATCH] revert changes to MBeanServerFileAccessController.java

---
 .../MBeanServerFileAccessController.java      | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java b/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java
index 1efd65ecd8344..d694d9cce31dd 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java
@@ -25,8 +25,6 @@
 
 package com.sun.jmx.remote.security;
 
-import jdk.internal.access.SharedSecrets;
-
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.security.AccessControlContext;
@@ -302,19 +300,16 @@ private static Properties propertiesFromFile(String fname)
         }
     }
 
-    @SuppressWarnings("removal")
     private synchronized void checkAccess(AccessType requiredAccess, String arg) {
-        final Subject s;
-        if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-            s = Subject.current();
-        } else {
-            AccessControlContext acc = AccessController.getContext();
-            s = AccessController.doPrivileged(new PrivilegedAction<>() {
-                        public Subject run() {
-                            return Subject.getSubject(acc);
-                        }
-                    });
-        }
+        @SuppressWarnings("removal")
+        final AccessControlContext acc = AccessController.getContext();
+        @SuppressWarnings("removal")
+        final Subject s =
+            AccessController.doPrivileged(new PrivilegedAction<>() {
+                    public Subject run() {
+                        return Subject.getSubject(acc);
+                    }
+                });
         if (s == null) return; /* security has not been enabled */
         final Set<Principal> principals = s.getPrincipals();
         String newPropertyValue = null;