File tree Expand file tree Collapse file tree 2 files changed +14
-6
lines changed
dd-java-agent/instrumentation/jetty-11/src Expand file tree Collapse file tree 2 files changed +14
-6
lines changed Original file line number Diff line number Diff line change @@ -20,6 +20,11 @@ class JettyAsyncHandlerTest extends Jetty11Test implements TestingGenericHttpNam
20
20
false // continuation test handler not working with sessions
21
21
}
22
22
23
+ @Override
24
+ boolean testWebsockets () {
25
+ false
26
+ }
27
+
23
28
static class ContinuationTestHandler implements Handler {
24
29
@Delegate
25
30
private final Handler delegate
Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ import jakarta.websocket.EndpointConfig
13
13
import jakarta.websocket.MessageHandler
14
14
import jakarta.websocket.Session
15
15
import jakarta.websocket.server.ServerEndpointConfig
16
+ import org.eclipse.jetty.server.Handler
16
17
import org.eclipse.jetty.server.Server
17
18
import org.eclipse.jetty.server.handler.ErrorHandler
18
19
import org.eclipse.jetty.server.session.SessionHandler
@@ -28,14 +29,16 @@ class JettyServer implements WebsocketServer {
28
29
def port = 0
29
30
final server = new Server (0 ) // select random open port
30
31
31
- JettyServer (ServletContextHandler handler ) {
32
+ JettyServer (Handler handler ) {
32
33
server. handler = handler
33
34
server. addBean(errorHandler)
34
- try {
35
- JakartaWebSocketServletContainerInitializer . configure(handler, (servletContext, container) -> {
36
- container. addEndpoint(ServerEndpointConfig.Builder . create(WsEndpoint . class, " /websocket" ). build())
37
- })
38
- } catch (Throwable ignored) {
35
+ if (handler instanceof ServletContextHandler ) {
36
+ try {
37
+ JakartaWebSocketServletContainerInitializer . configure(handler, (servletContext, container) -> {
38
+ container. addEndpoint(ServerEndpointConfig.Builder . create(WsEndpoint . class, " /websocket" ). build())
39
+ })
40
+ } catch (Throwable ignored) {
41
+ }
39
42
}
40
43
}
41
44
You can’t perform that action at this time.
0 commit comments