Fix potential NPE in InstrumentedResourceMethodApplicationListener (#…

…3178)
dropwizard · Feb 15, 2023 · 72a9ed8 · 72a9ed8
1 parent b3bc3bf
commit 72a9ed8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...in/java/io/dropwizard/metrics5/jersey2/InstrumentedResourceMethodApplicationListener.java b/...in/java/io/dropwizard/metrics5/jersey2/InstrumentedResourceMethodApplicationListener.java
@@ -308,7 +308,7 @@ public void onEvent(RequestEvent event) {
                     ContainerResponse containerResponse = event.getContainerResponse();
                     if (containerResponse == null && event.getException() != null) {
                         metric.mark(500);
-                    } else {
+                    } else if (containerResponse != null) {
                         metric.mark(containerResponse.getStatus());
                     }
                 }

diff --git a/...in/java/io/dropwizard/metrics5/jersey3/InstrumentedResourceMethodApplicationListener.java b/...in/java/io/dropwizard/metrics5/jersey3/InstrumentedResourceMethodApplicationListener.java
@@ -309,7 +309,7 @@ public void onEvent(RequestEvent event) {
                     ContainerResponse containerResponse = event.getContainerResponse();
                     if (containerResponse == null && event.getException() != null) {
                         metric.mark(500);
-                    } else {
+                    } else if (containerResponse != null) {
                         metric.mark(containerResponse.getStatus());
                     }
                 }

diff --git a/...n/java/io/dropwizard/metrics5/jersey31/InstrumentedResourceMethodApplicationListener.java b/...n/java/io/dropwizard/metrics5/jersey31/InstrumentedResourceMethodApplicationListener.java
@@ -309,7 +309,7 @@ public void onEvent(RequestEvent event) {
                     ContainerResponse containerResponse = event.getContainerResponse();
                     if (containerResponse == null && event.getException() != null) {
                         metric.mark(500);
-                    } else {
+                    } else if (containerResponse != null) {
                         metric.mark(containerResponse.getStatus());
                     }
                 }