Merge pull request quarkusio#35731 from geoand/quarkusio#35730

Guard against null headers when converting a provided Response
aloubyansky · Sep 5, 2023 · cdbdb70 · cdbdb70
2 parents 3dbd75d + c112aa5
commit cdbdb70
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/...er/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java b/...er/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java
@@ -195,10 +195,13 @@ private ResponseBuilderImpl fromResponse(Response response) {
         if (response.hasEntity()) {
             b.entity(response.getEntity());
         }
-        for (String headerName : response.getHeaders().keySet()) {
-            List<Object> headerValues = response.getHeaders().get(headerName);
-            for (Object headerValue : headerValues) {
-                b.header(headerName, headerValue);
+        var headers = response.getHeaders();
+        if (headers != null) {
+            for (String headerName : headers.keySet()) {
+                List<Object> headerValues = headers.get(headerName);
+                for (Object headerValue : headerValues) {
+                    b.header(headerName, headerValue);
+                }
             }
         }
         return (ResponseBuilderImpl) b;