chore: use SecurityManager only for JDKs up to 24

Author: cortlepp

modules/kernel/src/org/apache/axis2/java/security/AccessController.java

@@ -57,6 +57,7 @@
 
 
 public class AccessController {
+    private static final boolean SUPPORTS_SECURITY_MANAGER = Runtime.version().feature() < 24;
 
     /**
      * Performs the specified <code>PrivilegedAction</code> with privileges
@@ -71,8 +72,7 @@ public class AccessController {
      * @see #doPrivileged(PrivilegedExceptionAction)
      */
     public static <T> T doPrivileged(PrivilegedAction<T> action) {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
+        if (!SUPPORTS_SECURITY_MANAGER || System.getSecurityManager() == null) {
             return (action.run());
         } else {
             return java.security.AccessController.doPrivileged(action);
@@ -101,8 +101,7 @@ public static <T> T doPrivileged(PrivilegedAction<T> action) {
      * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
      */
     public static <T> T doPrivileged(PrivilegedAction<T> action, AccessControlContext context) {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
+        if (!SUPPORTS_SECURITY_MANAGER || System.getSecurityManager() == null) {
             return action.run();
         } else {
             return java.security.AccessController.doPrivileged(action, context);
@@ -126,8 +125,7 @@ public static <T> T doPrivileged(PrivilegedAction<T> action, AccessControlContex
      */
     public static <T> T doPrivileged(PrivilegedExceptionAction<T> action)
             throws PrivilegedActionException {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
+        if (!SUPPORTS_SECURITY_MANAGER || System.getSecurityManager() == null) {
             try {
                 return action.run();
             } catch (java.lang.RuntimeException e) {
@@ -167,8 +165,7 @@ public static <T> T doPrivileged(PrivilegedExceptionAction<T> action,
                                       AccessControlContext context)
             throws PrivilegedActionException {
 
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
+        if (!SUPPORTS_SECURITY_MANAGER || System.getSecurityManager() == null) {
             try {
                 return action.run();
             } catch (java.lang.RuntimeException e) {
@@ -206,7 +203,9 @@ public static AccessControlContext getContext() {
      *                                is not permitted, based on the current security policy.
      */
     public static void checkPermission(Permission perm) throws AccessControlException {
-        java.security.AccessController.checkPermission(perm);
+        if (SUPPORTS_SECURITY_MANAGER) {
+            java.security.AccessController.checkPermission(perm);
+        }
     }
 
     /**

modules/kernel/test/org/apache/axis2/java/security/driver/Java2SecTest.java

@@ -38,6 +38,8 @@
 import java.util.Calendar;
 import java.util.TimeZone;
 
+import static org.junit.Assume.assumeTrue;
+
 /**
  * Java2SecTest demostrates the usages of AccessController class and Policy file(s) while Security Manager is enabled:
  * 1. testNoPrivilegePassed shows the usage of no AccessController but it still work fine
@@ -68,6 +70,12 @@ public Java2SecTest() {
         System.out.println("Current time => " + sdf.format(cal.getTime()) + "\n");
     }
 
+    @Override
+    public void setUp() throws Exception {
+        // Security Manager was removed after that
+        assumeTrue(Runtime.version().feature() < 24);
+    }
+
     // Constructor
     public Java2SecTest(String arg) {
         super(arg);