Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.http.server.ServletServerHttpResponse;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.CollectionUtils;
Expand Down Expand Up @@ -67,15 +68,18 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Serv
private static final ThreadLocal<WebSocketHandlerContainer> containerHolder =
new NamedThreadLocal<>("WebSocketHandlerContainer");


@Nullable
private WebSocketPolicy policy;

@Nullable
private WebSocketServerFactory factory;

@Nullable
private ServletContext servletContext;

private volatile boolean running = false;

@Nullable
private volatile List<WebSocketExtension> supportedExtensions;


Expand Down Expand Up @@ -196,7 +200,7 @@ private Set<String> getExtensionNames() {

@Override
public void upgrade(ServerHttpRequest request, ServerHttpResponse response,
String selectedProtocol, List<WebSocketExtension> selectedExtensions, Principal user,
@Nullable String selectedProtocol, List<WebSocketExtension> selectedExtensions, @Nullable Principal user,
WebSocketHandler wsHandler, Map<String, Object> attributes) throws HandshakeFailureException {

Assert.isInstanceOf(ServletServerHttpRequest.class, request, "ServletServerHttpRequest required");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
/**
* Server-side support for the Jetty 9+ WebSocket API.
*/
@NonNullApi
@NonNullFields
package org.springframework.web.socket.server.jetty;

import org.springframework.lang.NonNullApi;
import org.springframework.lang.NonNullFields;