[tomcat] 02/03: Remove references to the SecurityManager from the WebSocket API

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 563ad066a555637dda838e61029408ec1b7ccb39
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 11 18:32:58 2023 +0000

    Remove references to the SecurityManager from the WebSocket API
---
 .../jakarta/websocket/server/ServerEndpointConfig.java | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/java/jakarta/websocket/server/ServerEndpointConfig.java 
b/java/jakarta/websocket/server/ServerEndpointConfig.java
index 036c833621..8de6603669 100644
--- a/java/jakarta/websocket/server/ServerEndpointConfig.java
+++ b/java/jakarta/websocket/server/ServerEndpointConfig.java
@@ -16,8 +16,6 @@
  */
 package jakarta.websocket.server;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -163,12 +161,7 @@ public interface ServerEndpointConfig extends 
EndpointConfig {
             if (defaultImpl == null) {
                 synchronized (defaultImplLock) {
                     if (defaultImpl == null) {
-                        if (System.getSecurityManager() == null) {
-                            defaultImpl = loadDefault();
-                        } else {
-                            defaultImpl =
-                                    AccessController.doPrivileged(new 
PrivilegedLoadDefault());
-                        }
+                        defaultImpl = loadDefault();
                     }
                 }
             }
@@ -204,15 +197,6 @@ public interface ServerEndpointConfig extends 
EndpointConfig {
         }
 
 
-        private static class PrivilegedLoadDefault implements 
PrivilegedAction<Configurator> {
-
-            @Override
-            public Configurator run() {
-                return Configurator.loadDefault();
-            }
-        }
-
-
         /**
          * Return the platform default configurator.
          *


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org