Dispose CTS in HubConnection streaming (#51117)

dotnet · Oct 4, 2023 · 9e5ae70 · 9e5ae70
1 parent 426ed0f
commit 9e5ae70
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs
@@ -853,7 +853,7 @@ async Task ReadChannelStream()
             }
         }
 
-        return CommonStreaming(connectionState, streamId, ReadChannelStream);
+        return CommonStreaming(connectionState, streamId, ReadChannelStream, tokenSource);
     }
 
     // this is called via reflection using the `_sendIAsyncStreamItemsMethod` field
@@ -870,11 +870,14 @@ async Task ReadAsyncEnumerableStream()
             }
         }
 
-        return CommonStreaming(connectionState, streamId, ReadAsyncEnumerableStream);
+        return CommonStreaming(connectionState, streamId, ReadAsyncEnumerableStream, tokenSource);
     }
 
-    private async Task CommonStreaming(ConnectionState connectionState, string streamId, Func<Task> createAndConsumeStream)
+    private async Task CommonStreaming(ConnectionState connectionState, string streamId, Func<Task> createAndConsumeStream, CancellationTokenSource cts)
     {
+        // make sure we dispose the CTS created by StreamAsyncCore once streaming completes
+        using var _ = cts;
+
         Log.StartingStream(_logger, streamId);
         string? responseError = null;
         try