Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZK-5561: ZK Websocket Quarkus compatibility #3228

Merged
merged 1 commit into from
Oct 25, 2024
Merged

ZK-5561: ZK Websocket Quarkus compatibility #3228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions zk/src/main/java/org/zkoss/zk/ui/http/ZKWebSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* ZKWebSocket.java

Purpose:

Description:

History:
6:10 PM 7/9/15, Created by jumperchen

Expand Down Expand Up @@ -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
}
Expand Down
1 change: 1 addition & 0 deletions zkdoc/release-note
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading