ROLLBAK: Bug 38139257 - [38041090->25.03.3] Failed to restart services: java.lang.SecurityException due to Subject is not inherited from the parent thread (Undo @117247+)

[git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v25.03/": change = 117430]

Author: lsho

prj/coherence-core-21/src/main/java/com/tangosol/net/security/DoAsAction.java

@@ -29,7 +29,7 @@
  * @author Jonathan Knight 25/01/2025
  */
 @SuppressWarnings("removal")
-public class SecurityManagerWrapperImpl
+class SecurityManagerWrapperImpl
         implements SecurityManagerWrapper
     {
     SecurityManagerWrapperImpl()
@@ -71,7 +71,7 @@ public <T> T doIfSecure(PrivilegedExceptionAction<T> action) throws Exception
         {
         if (hasSecurityManager())
             {
-            return AccessController.doPrivileged(action);
+            AccessController.doPrivileged(action);
             }
         return action.run();
         }
@@ -83,10 +83,7 @@ public void doIfSecure(PrivilegedAction<?> action, Runnable fallback)
             {
             AccessController.doPrivileged(action);
             }
-        else
-            {
-            fallback.run();
-            }
+        fallback.run();
         }
 
     @Override

prj/coherence-core-21/src/main/java/com/tangosol/net/security/SecurityManagerWrapperImpl.java

@@ -11,7 +11,7 @@
 import com.oracle.coherence.common.base.Logger;
 import com.tangosol.coherence.config.Config;
 
-import com.tangosol.net.security.SecurityManagerWrapperImpl;
+import com.tangosol.net.security.SecurityHelper;
 
 import java.security.CodeSource;
 
@@ -62,7 +62,7 @@ public static Unsafe getUnsafe()
             {
             String sClassName = aStack[i].getClassName();
             // skip frames pertinent to use of Unsafe within a security block
-            if (!sClassName.startsWith("java.security") && !sClassName.startsWith("javax.security"))
+            if (!sClassName.startsWith("java.security"))
                 {
                 sCallingClass = sClassName;
                 break;
@@ -98,7 +98,7 @@ public static Unsafe getUnsafe()
 
         CodeSource srcUnsafe   = Unsafe.class.getProtectionDomain().getCodeSource();
         CodeSource srcCaller   = clzCaller.getProtectionDomain().getCodeSource();
-        CodeSource srcSecurity = SecurityManagerWrapperImpl.class.getProtectionDomain().getCodeSource();
+        CodeSource srcSecurity = SecurityHelper.getCodeSource();
         if (Base.equals(srcCaller, srcUnsafe) || Base.equals(srcCaller, srcSecurity))
             {
             return INSTANCE;