Fix potential NPE in InstrumentedResourceMethodApplicationListener (#3179)

joschi · web-flow · commit cf4a00570c78 · 2023-02-15T23:11:39.000Z
diff --git a/metrics-jersey2/src/main/java/com/codahale/metrics/jersey2/InstrumentedResourceMethodApplicationListener.java b/metrics-jersey2/src/main/java/com/codahale/metrics/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/metrics-jersey3/src/main/java/com/codahale/metrics/jersey3/InstrumentedResourceMethodApplicationListener.java b/metrics-jersey3/src/main/java/com/codahale/metrics/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/metrics-jersey31/src/main/java/io/dropwizard/metrics/jersey31/InstrumentedResourceMethodApplicationListener.java b/metrics-jersey31/src/main/java/io/dropwizard/metrics/jersey31/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());
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ public void onEvent(RequestEvent event) {`
`308`	`308`	`ContainerResponse containerResponse = event.getContainerResponse();`
`309`	`309`	`if (containerResponse == null && event.getException() != null) {`
`310`	`310`	`metric.mark(500);`
`311`		`- } else {`
	`311`	`+ } else if (containerResponse != null) {`
`312`	`312`	`metric.mark(containerResponse.getStatus());`
`313`	`313`	`}`
`314`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ public void onEvent(RequestEvent event) {`
`309`	`309`	`ContainerResponse containerResponse = event.getContainerResponse();`
`310`	`310`	`if (containerResponse == null && event.getException() != null) {`
`311`	`311`	`metric.mark(500);`
`312`		`- } else {`
	`312`	`+ } else if (containerResponse != null) {`
`313`	`313`	`metric.mark(containerResponse.getStatus());`
`314`	`314`	`}`
`315`	`315`	`}`