From 6e6f83c7f21f01fa1231797fbc596de25bd8b669 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 8 Jan 2021 14:55:44 +1100 Subject: [PATCH] Fix bad refactor of getMappings method. Signed-off-by: Lachlan Roberts --- .../jetty/websocket/core/server/WebSocketMappings.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java index 80670ce21bc6..c176ed70162b 100644 --- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java +++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java @@ -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));