3.7.3

Author: noear

solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta/src/main/java/org/noear/solon/server/tomcat/TomcatServer.java

@@ -46,7 +46,6 @@
  */
 public class TomcatServer extends TomcatServerBase {
     protected boolean isSecure;
-    protected boolean enableWebSocket;
 
     public boolean isSecure() {
         return isSecure;

solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta/src/main/java/org/noear/solon/server/tomcat/TomcatServerBase.java

@@ -56,6 +56,7 @@ public abstract class TomcatServerBase implements ServerLifecycle, HttpServerCon
     protected Set<Integer> addHttpPorts = new LinkedHashSet<>();
 
     protected boolean enableHttp2 = false;
+    protected boolean enableWebSocket;
 
     public TomcatServerBase(HttpServerProps props) {
         this.props = props;
@@ -122,7 +123,7 @@ public void start(String host, int port) throws Throwable {
 
         _server.start();
 
-        if(TcWebSocketManager.isEnableWebSocket()) {
+        if(enableWebSocket) {
         	TcWebSocketManager.registerEndpoints(_context);        	
         }
     }

solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta/src/main/java/org/noear/solon/server/tomcat/websocket/TcWebSocketManager.java

@@ -34,9 +34,6 @@
  */
 public class TcWebSocketManager {
     private static final Logger log = LoggerFactory.getLogger(TcWebSocketManager.class);
-    private static boolean enableWebSocket = false;
-    
-    private TcWebSocketManager() {}
 
     /**
      * 在Tomcat上下文中初始化WebSocket支持
@@ -51,7 +48,6 @@ public static void init(Context context) {
         try {
             // 注册WebSocket容器初始化器
             context.addServletContainerInitializer(new WsSci(), null);
-            enableWebSocket = true;
             log.info("Tomcat WebSocket initialized");
         } catch (Exception e) {
             log.error("Failed to initialize Tomcat WebSocket", e);
@@ -97,23 +93,4 @@ public static void registerEndpoints(Context context) {
             log.error("Failed to register Tomcat WebSocket endpoints", e);
         }
     }
-
-    /**
-     * 检查WebSocket是否已启用
-     */
-    public static boolean isEnableWebSocket() {
-        return enableWebSocket;
-    }
-    
-    /**
-     * 获取WebSocket容器
-     */
-//    public static ServerContainer getServerContainer(Context context) {
-//        if (context == null) {
-//            return null;
-//        }
-//        
-//        return (ServerContainer) context.getServletContext()
-//                .getAttribute("jakarta.websocket.server.ServerContainer");
-//    }
 }