ZK-5561: ZK Websocket Quarkus compatibility

zkoss · Oct 25, 2024 · 30dbe9d · 30dbe9d
1 parent e70bc54
commit 30dbe9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/zk/src/main/java/org/zkoss/zk/ui/http/ZKWebSocket.java b/zk/src/main/java/org/zkoss/zk/ui/http/ZKWebSocket.java
@@ -1,9 +1,9 @@
 /* ZKWebSocket.java
 
 	Purpose:
-		
+
 	Description:
-		
+
 	History:
 		6:10 PM 7/9/15, Created by jumperchen
 
@@ -53,7 +53,11 @@ public final class ZKWebSocket extends ServerEndpointConfig.Configurator {
 	 */
 	@Override
 	public void modifyHandshake(ServerEndpointConfig config, HandshakeRequest request, HandshakeResponse response) {
-		org.zkoss.zk.ui.Session zkSession = SessionsCtrl.getSession(WebApps.getCurrent(), request.getHttpSession());
+		Object httpSession = request.getHttpSession();
+		if (httpSession == null) {
+			return; // skip for ZK-5561
+		}
+		org.zkoss.zk.ui.Session zkSession = SessionsCtrl.getSession(WebApps.getCurrent(), httpSession);
 		if (zkSession == null) {
 			return; //skip when session is expired but websocket try to reconnect
 		}

diff --git a/zkdoc/release-note b/zkdoc/release-note
@@ -1,6 +1,7 @@
 ZK 10.1.0
 * Features
   ZK-5782: Upgrade WCAG with the lighthouse 12.x detection tools
+  ZK-5561: ZK Websocket Quarkus compatibility
 
 * Bugs
   ZK-5764: Unable to call original method when using custom ViewModelAnnotationResolver