Merge pull request #17601 from geoand/#17597

Preserve TCCL when using coroutines in RESTEasy Reactive
quarkusio · Jun 2, 2021 · 27ba1cb · 27ba1cb
2 parents f648d2f + 1c1177a
commit 27ba1cb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...in/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineInvocationHandler.kt b/...in/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineInvocationHandler.kt
@@ -4,7 +4,6 @@ import io.vertx.core.Vertx
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import org.eclipse.microprofile.context.ManagedExecutor
 import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext
 import org.jboss.resteasy.reactive.server.spi.EndpointInvoker
 import org.jboss.resteasy.reactive.server.spi.ServerRestHandler
@@ -15,6 +14,9 @@ private val logger = LoggerFactory.getLogger(CoroutineInvocationHandler::class.j
 class CoroutineInvocationHandler(private val invoker: EndpointInvoker,
                                  private val coroutineScope: CoroutineScope) : ServerRestHandler {
 
+    private val originalTCCL: ClassLoader = Thread.currentThread().contextClassLoader
+
+
     override fun handle(requestContext: ResteasyReactiveRequestContext) {
         if (requestContext.result != null) {
             return
@@ -32,6 +34,8 @@ class CoroutineInvocationHandler(private val invoker: EndpointInvoker,
 
         requestContext.suspend()
         coroutineScope.launch(context = dispatcher) {
+            // ensure the proper CL is not lost in dev-mode
+            Thread.currentThread().contextClassLoader = originalTCCL
             try {
                 requestContext.result = invoker.invokeCoroutine(requestContext.endpointInstance, requestContext.parameters)
             } catch (t: Throwable) {