Skip to content

Commit 8448dc9

Browse files
committed
Upgrade to Jetty 12.1.0.beta1
Closes gh-35084
1 parent c17b481 commit 8448dc9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

framework-platform/framework-platform.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
api(platform("org.apache.groovy:groovy-bom:4.0.27"))
1616
api(platform("org.apache.logging.log4j:log4j-bom:3.0.0-beta3"))
1717
api(platform("org.assertj:assertj-bom:3.27.3"))
18-
api(platform("org.eclipse.jetty:jetty-bom:12.1.0.beta0"))
18+
api(platform("org.eclipse.jetty:jetty-bom:12.1.0.beta1"))
1919
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.0.beta0"))
2020
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.1"))

spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public Mono<Void> execute(URI url, WebSocketHandler handler) {
8989
@Override
9090
public Mono<Void> execute(URI url, @Nullable HttpHeaders headers, WebSocketHandler handler) {
9191

92-
ClientUpgradeRequest upgradeRequest = new ClientUpgradeRequest();
92+
ClientUpgradeRequest upgradeRequest = new ClientUpgradeRequest(url);
9393
upgradeRequest.setSubProtocols(handler.getSubProtocols());
9494
if (headers != null) {
9595
headers.headerNames().forEach(header -> upgradeRequest.setHeader(header, headers.getValuesAsList(header)));
@@ -110,7 +110,7 @@ public void onHandshakeResponse(Request request, Response response) {
110110
JettyWebSocketHandlerAdapter handlerAdapter = new JettyWebSocketHandlerAdapter(handler, session ->
111111
new JettyWebSocketSession(session, Objects.requireNonNull(handshakeInfo.get()), DefaultDataBufferFactory.sharedInstance, completion));
112112
try {
113-
this.client.connect(handlerAdapter, url, upgradeRequest, jettyUpgradeListener)
113+
this.client.connect(handlerAdapter, upgradeRequest, jettyUpgradeListener)
114114
.exceptionally(throwable -> {
115115
// Only fail the completion if we have an error
116116
// as the JettyWebSocketSession will never be opened.

0 commit comments

Comments
 (0)