Merge pull request #19062 from geoand/#16122

Avoid potential NPE `@Context ResourceInfo` is used
quarkusio · Jul 28, 2021 · 856d0c3 · 856d0c3
2 parents ac739ae + 87e622f
commit 856d0c3
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/.../runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java b/.../runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java
@@ -19,6 +19,7 @@
 import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
 import org.jboss.resteasy.reactive.server.jaxrs.ResourceContextImpl;
 import org.jboss.resteasy.reactive.server.jaxrs.SseImpl;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
 import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
 /**
@@ -86,13 +87,25 @@ Providers providers() {
     @RequestScoped
     @Produces
     ResourceInfo resourceInfo() {
-        return getContext().getTarget().getLazyMethod();
+        RuntimeResource target = getTarget();
+        if (target != null) {
+            return target.getLazyMethod();
+        }
+        return SimpleResourceInfo.NullValues.INSTANCE;
     }
 
     @RequestScoped
     @Produces
     SimpleResourceInfo simplifiedResourceInfo() {
-        return getContext().getTarget().getSimplifiedResourceInfo();
+        RuntimeResource target = getTarget();
+        if (target != null) {
+            return target.getSimplifiedResourceInfo();
+        }
+        return SimpleResourceInfo.NullValues.INSTANCE;
+    }
+
+    private RuntimeResource getTarget() {
+        return getContext().getTarget();
     }
 
     @ApplicationScoped