Merge pull request #1867 from bstansberry/UNDERTOW-2681

fl4via · web-flow · commit 4a13dac48ef3 · 2026-01-15T09:01:35.000-03:00
[UNDERTOW-2681] In MessageHandlers for annotated methods set the TCCL…
diff --git a/websockets-jsr/src/main/java/io/undertow/websockets/jsr/annotated/AnnotatedEndpoint.java b/websockets-jsr/src/main/java/io/undertow/websockets/jsr/annotated/AnnotatedEndpoint.java
@@ -115,11 +115,16 @@ public void onMessage(Object partialMessage, boolean last) {
                 params.put(method.getMessageType(), partialMessage);
                 params.put(boolean.class, last);
                 final Object result;
+                final ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
                 try {
-                    result = method.invoke(instance.getInstance(), params);
+                    Object invokeTarget = instance.getInstance();
+                    Thread.currentThread().setContextClassLoader(invokeTarget.getClass().getClassLoader());
+                    result = method.invoke(invokeTarget, params);
                 } catch (Throwable e) {
                     AnnotatedEndpoint.this.onError(session, e);
                     return;
+                } finally {
+                    Thread.currentThread().setContextClassLoader(oldCL);
                 }
                 sendResult(result, session);
             }
@@ -138,11 +143,16 @@ public void onMessage(Object partialMessage) {
                 params.put(Map.class, session.getPathParameters());
                 params.put(method.getMessageType(), partialMessage);
                 final Object result;
+                final ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
                 try {
-                    result = method.invoke(instance.getInstance(), params);
+                    Object invokeTarget = instance.getInstance();
+                    Thread.currentThread().setContextClassLoader(invokeTarget.getClass().getClassLoader());
+                    result = method.invoke(invokeTarget, params);
                 } catch (Exception e) {
                     AnnotatedEndpoint.this.onError(session, e);
                     return;
+                } finally {
+                    Thread.currentThread().setContextClassLoader(oldCL);
                 }
                 sendResult(result, session);
             }
