fix(Spanner): Really check for null settings on BatchWrite

amanda-tarafa · amanda-tarafa · commit 70d83618badc · 2026-02-10T15:59:39.000-08:00
diff --git a/apis/Google.Cloud.Spanner.V1/Google.Cloud.Spanner.V1/ManagedSession.cs b/apis/Google.Cloud.Spanner.V1/Google.Cloud.Spanner.V1/ManagedSession.cs
@@ -62,7 +62,7 @@ public async Task<ManagedTransaction> BeginTransactionAsync(TransactionOptions t
 	public async Task<AsyncResponseStream<BatchWriteResponse>> BatchWriteAsync(BatchWriteRequest request, CallSettings callSettings)
 	{
 		GaxPreconditions.CheckNotNull(request, nameof(request));
-        CancellationToken cancellationToken = callSettings.CancellationToken ?? default;
+        CancellationToken cancellationToken = callSettings?.CancellationToken ?? default;
         var session = await _lifecycleManager.GetFreshSessionAsync(cancellationToken).ConfigureAwait(false);
 
         // Populate the request with the current session name.

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public async Task<ManagedTransaction> BeginTransactionAsync(TransactionOptions t`
`62`	`62`	`public async Task<AsyncResponseStream<BatchWriteResponse>> BatchWriteAsync(BatchWriteRequest request, CallSettings callSettings)`
`63`	`63`	`{`
`64`	`64`	`GaxPreconditions.CheckNotNull(request, nameof(request));`
`65`		`- CancellationToken cancellationToken = callSettings.CancellationToken ?? default;`
	`65`	`+ CancellationToken cancellationToken = callSettings?.CancellationToken ?? default;`
`66`	`66`	`var session = await _lifecycleManager.GetFreshSessionAsync(cancellationToken).ConfigureAwait(false);`
`67`	`67`
`68`	`68`	`// Populate the request with the current session name.`