Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Jetty WebSocket test failures

Browse Source 
See gh-27424
This commit is contained in:
Rossen Stoyanchev
2021-09-17 14:36:10 +01:00
parent b732ff3495
commit 48875dc44f
2 changed files with 14 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
View File

@@ -27,6 +27,7 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.servlet.DispatcherServlet;
@@ -57,6 +58,7 @@ public class JettyWebSocketTestServer implements WebSocketTestServer {
ServletHolder servletHolder = new ServletHolder(new DispatcherServlet(wac));
this.contextHandler = new ServletContextHandler();
this.contextHandler.addServlet(servletHolder, "/");
this.contextHandler.addServletContainerInitializer(new JettyWebSocketServletContainerInitializer());
for (Filter filter : filters) {
this.contextHandler.addFilter(new FilterHolder(filter), "/*", getDispatcherTypes());
}