|
25 | 25 | import org.eclipse.jetty.server.Server; |
26 | 26 | import org.eclipse.jetty.server.handler.ErrorHandler; |
27 | 27 | import org.eclipse.jetty.ee10.servlet.ServletContextHandler; |
| 28 | +import org.eclipse.jetty.util.Callback; |
28 | 29 | import org.junit.jupiter.api.extension.RegisterExtension; |
29 | 30 |
|
30 | 31 | public abstract class Jetty12Servlet5Test |
@@ -82,19 +83,15 @@ protected SpanDataAssert assertResponseSpan( |
82 | 83 | protected Server setupServer() throws Exception { |
83 | 84 | Server jettyServer = new Server(new InetSocketAddress("localhost", port)); |
84 | 85 |
|
85 | | - ServletContextHandler servletContext = new ServletContextHandler(contextPath); |
86 | | - servletContext.errorHandler = new Request.Handler() { |
87 | | - |
88 | | - @Override |
89 | | - boolean handle(Request request, Response response, Callback callback) throws Exception { |
90 | | - String message = (String) request.getAttribute("org.eclipse.jetty.server.error_message") |
| 86 | + ServletContextHandler servletContext = new ServletContextHandler(getContextPath()); |
| 87 | + servletContext.setErrorHandler((request,response,callback) -> { |
| 88 | + String message = (String) request.getAttribute("org.eclipse.jetty.server.error_message"); |
91 | 89 | if (message != null) { |
92 | | - response.write(true, StandardCharsets.UTF_8.encode(message), Callback.NOOP) |
| 90 | + response.write(true, StandardCharsets.UTF_8.encode(message), Callback.NOOP); |
93 | 91 | } |
94 | | - callback.succeeded() |
95 | | - return true |
96 | | - } |
97 | | - }); |
| 92 | + callback.succeeded(); |
| 93 | + return true; |
| 94 | + }); |
98 | 95 | setupServlets(servletContext); |
99 | 96 | jettyServer.setHandler(servletContext); |
100 | 97 |
|
|
0 commit comments