Guard against null headers when converting a provided Response

Relates to: quarkusio#35730 (cherry picked from commit c112aa5)
aloubyansky · Oct 25, 2023 · 5cc9363 · 5cc9363
1 parent 5ec196c
commit 5cc9363
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;