Skip to content

Commit 74182cd

Browse files
committed
Ensure correct detection of Jetty WebSocket server
1 parent 1f8913a commit 74182cd

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public class HandshakeWebSocketService implements WebSocketService, ServletConte
8989
tomcatWsPresent = ClassUtils.isPresent(
9090
"org.apache.tomcat.websocket.server.WsHttpUpgradeHandler", classLoader);
9191
jettyWsPresent = ClassUtils.isPresent(
92-
"org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer", classLoader);
92+
"org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer", classLoader);
9393
undertowWsPresent = ClassUtils.isPresent(
9494
"io.undertow.websockets.WebSocketProtocolHandshakeHandler", classLoader);
9595
reactorNettyPresent = ClassUtils.isPresent(

spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public abstract class AbstractHandshakeHandler implements HandshakeHandler, Life
9494
tomcatWsPresent = ClassUtils.isPresent(
9595
"org.apache.tomcat.websocket.server.WsHttpUpgradeHandler", classLoader);
9696
jettyWsPresent = ClassUtils.isPresent(
97-
"org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer", classLoader);
97+
"org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer", classLoader);
9898
undertowWsPresent = ClassUtils.isPresent(
9999
"io.undertow.websockets.jsr.ServerWebSocketContainer", classLoader);
100100
glassfishWsPresent = ClassUtils.isPresent(

spring-websocket/src/main/java/org/springframework/web/socket/server/support/HandshakeHandlerRuntimeHints.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ class HandshakeHandlerRuntimeHints implements RuntimeHintsRegistrar {
4949
tomcatWsPresent = ClassUtils.isPresent(
5050
"org.apache.tomcat.websocket.server.WsHttpUpgradeHandler", classLoader);
5151
jettyWsPresent = ClassUtils.isPresent(
52-
"org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer", classLoader);
52+
"org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer", classLoader);
5353
undertowWsPresent = ClassUtils.isPresent(
5454
"io.undertow.websockets.jsr.ServerWebSocketContainer", classLoader);
5555
glassfishWsPresent = ClassUtils.isPresent(

0 commit comments

Comments
 (0)