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

Jump to bottom

Fix bad refactor of WebSocket getMappings method. #5861

Merged
merged 1 commit into from
Jan 12, 2021
Merged

Fix bad refactor of WebSocket getMappings method. #5861

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
4 changes: 2 additions & 2 deletions ...-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ public class WebSocketMappings implements Dumpable, LifeCycle.Listener
private static final Logger LOG = LoggerFactory.getLogger(WebSocketMappings.class);
public static final String WEBSOCKET_MAPPING_ATTRIBUTE = WebSocketMappings.class.getName();

public static WebSocketMappings getWebSocketNegotiator(ServletContext servletContext)
public static WebSocketMappings getMappings(ServletContext servletContext)
{
return (WebSocketMappings)servletContext.getAttribute(WEBSOCKET_MAPPING_ATTRIBUTE);
}

public static WebSocketMappings ensureMappings(ServletContext servletContext)
{
WebSocketMappings mapping = getWebSocketNegotiator(servletContext);
WebSocketMappings mapping = getMappings(servletContext);
if (mapping == null)
{
mapping = new WebSocketMappings(WebSocketServerComponents.getWebSocketComponents(servletContext));
Expand Down