Merge pull request #24138 from geoand/rr-multi-npe

Prevent NPE when a JAX-RS method returns a Multi and does not declare @produces
quarkusio · Mar 7, 2022 · 56dc389 · 56dc389
2 parents f8b96e9 + 2b6ae07
commit 56dc389
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...e/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java b/...e/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java
@@ -12,6 +12,7 @@
 import javax.ws.rs.core.MediaType;
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.reactive.common.util.RestMediaType;
+import org.jboss.resteasy.reactive.common.util.ServerMediaType;
 import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
 import org.jboss.resteasy.reactive.server.core.SseUtil;
 import org.jboss.resteasy.reactive.server.core.StreamingUtil;
@@ -243,7 +244,12 @@ public void handle(ResteasyReactiveRequestContext requestContext) throws Excepti
             // media type negotiation and fixed entity writer set up, perhaps it's better than
             // cancelling the normal route?
             // or make this SSE produce build-time
-            MediaType[] mediaTypes = requestContext.getTarget().getProduces().getSortedOriginalMediaTypes();
+            ServerMediaType produces = requestContext.getTarget().getProduces();
+            if (produces == null) {
+                throw new IllegalStateException(
+                        "Negotiation or dynamic media type not supported yet for Multi: please use the @Produces annotation when returning a Multi");
+            }
+            MediaType[] mediaTypes = produces.getSortedOriginalMediaTypes();
             if (mediaTypes.length != 1) {
                 throw new IllegalStateException(
                         "Negotiation or dynamic media type not supported yet for Multi: please use a single @Produces annotation");