From 603033f1fa11d90e7969c06ea4d22a653b77a3c2 Mon Sep 17 00:00:00 2001
From: Larry Safran <lsafran@google.com>
Date: Thu, 27 Jun 2024 14:08:05 -0700
Subject: [PATCH] Add null check to cleanup to avoid NPE (#11340)

---
 .../java/io/grpc/testing/integration/StressTestClient.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/StressTestClient.java b/interop-testing/src/main/java/io/grpc/testing/integration/StressTestClient.java
index c344f09e19..7fafe43be0 100644
--- a/interop-testing/src/main/java/io/grpc/testing/integration/StressTestClient.java
+++ b/interop-testing/src/main/java/io/grpc/testing/integration/StressTestClient.java
@@ -308,7 +308,9 @@ public class StressTestClient {
     }
 
     try {
-      metricsServer.shutdownNow();
+      if (metricsServer != null) {
+        metricsServer.shutdownNow();
+      }
     } catch (Throwable t) {
       log.log(Level.WARNING, "Error shutting down metrics service!", t);
     }