fix: fix a possible NPE that could happen when shutting down a grpc Storage instance (#3089)

BenWhitehead · web-flow · commit 56f5d0ae8826 · 2025-05-06T12:42:39.000-04:00
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcUtils.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcUtils.java
@@ -72,6 +72,7 @@ static GrpcCallContext contextWithBucketName(String bucketName, GrpcCallContext
   static <C extends Closeable> void closeAll(Collection<C> closeables) throws IOException {
     IOException ioException =
         closeables.stream()
+            .filter(Objects::nonNull)
             .map(
                 stream -> {
                   try {
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/GrpcUtilsTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/GrpcUtilsTest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.storage;
+
+import java.io.IOException;
+import java.util.Collections;
+import org.junit.Test;
+
+public final class GrpcUtilsTest {
+
+  @Test
+  public void closeAll_noNpeIfNullStream() throws IOException {
+    GrpcUtils.closeAll(Collections.singletonList(null));
+  }
+}
