From 1d074d6cfb4b4c12648ddeb9221ae8711e3b7176 Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 31 Oct 2022 07:26:22 +0100 Subject: [PATCH] Prevent null pointer in setAllHeaders I didn't add any test to cover this change because it's easier to fix than to replicate the conditions to reproduce it in either the extension or an integration test than expected taking into account we have a reproducer. Still let me know if you want it to cover it and maybe I can add wiremock in the integration-tests/rest-client-reactive. Fix https://github.com/quarkusio/quarkus/issues/28922 --- .../reactive/common/jaxrs/AbstractResponseBuilder.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java index 591867ed4b82f..27a43da67ef28 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java @@ -131,9 +131,11 @@ public T populateResponse(T response, boolean copyHeade } public void setAllHeaders(MultivaluedMap values) { - for (Map.Entry> i : values.entrySet()) { - for (String v : i.getValue()) { - metadata.add(i.getKey(), v); + if (values != null) { + for (Map.Entry> i : values.entrySet()) { + for (String v : i.getValue()) { + metadata.add(i.getKey(), v); + } } } }