Merge pull request #4431 from DataDog/glopes/openliberty-blocking-NPE

Openliberty: fix NPE after blocking response
DataDog · Dec 15, 2022 · 35222be · 35222be
2 parents 0df0e19 + 9bcc90c
commit 35222be
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java b/...0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java
@@ -98,6 +98,9 @@ public static class HandleRequestAdvice {
       Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
       if (rba != null) {
         ServletBlockingHelper.commitBlockingResponse(request, (SRTServletResponse) resp, rba);
+        // prevent caching of the handler
+        req.setAttribute(
+            "javax.servlet.error.status_code", ((SRTServletResponse) resp).getStatusCode());
         return true; // skip method body
       }