Addressed comments

googleapis · Nov 11, 2024 · c7ec27d · c7ec27d
1 parent b56c88f
commit c7ec27d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
@@ -773,7 +773,9 @@ CloseableIterator<PartialResultSet> startStream(
               AsyncResultSet.StreamMessageListener streamListener) {
             GrpcStreamIterator stream =
                 new GrpcStreamIterator(statement, prefetchChunks, cancelQueryWhenClientIsClosed);
-            stream.registerListener(streamListener);
+            if (streamListener != null) {
+              stream.registerListener(streamListener);
+            }
             if (partitionToken != null) {
               request.setPartitionToken(partitionToken);
             }
@@ -967,7 +969,9 @@ CloseableIterator<PartialResultSet> startStream(
               AsyncResultSet.StreamMessageListener streamListener) {
             GrpcStreamIterator stream =
                 new GrpcStreamIterator(prefetchChunks, cancelQueryWhenClientIsClosed);
-            stream.registerListener(streamListener);
+            if (streamListener != null) {
+              stream.registerListener(streamListener);
+            }
             TransactionSelector selector = null;
             if (resumeToken != null) {
               builder.setResumeToken(resumeToken);