Fixed double dispose of continous task (#6484)

ChilliCream · Aug 31, 2023 · 1a5cf92 · 1a5cf92
1 parent 7818a9f
commit 1a5cf92
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/HotChocolate/Core/src/Subscriptions.Postgres/ContinuousTask.cs b/src/HotChocolate/Core/src/Subscriptions.Postgres/ContinuousTask.cs
@@ -7,6 +7,7 @@ internal sealed class ContinuousTask : IAsyncDisposable
     private readonly CancellationTokenSource _completion = new();
     private readonly Func<CancellationToken, Task> _handler;
     private readonly Task _task;
+    private bool disposed;
 
     public ContinuousTask(Func<CancellationToken, Task> handler)
     {
@@ -46,13 +47,22 @@ private async Task RunContinuously()
     /// <inheritdoc />
     public async ValueTask DisposeAsync()
     {
+        if(disposed)
+        {
+            return;
+        }
+
+        if(!_completion.IsCancellationRequested)
+        {
 #if NET8_0_OR_GREATER
-        await _completion.CancelAsync();
+            await _completion.CancelAsync();
 #else
-        _completion.Cancel();
+            _completion.Cancel();
 #endif
+        }
+
         _completion.Dispose();
 
-        await _task;
+        disposed = true;
     }
 }