Fixed issue with cancellation of ParallelServerApi (#121)

specklesystems · Sep 18, 2024 · 694e9e1 · 694e9e1
1 parent 0f29aac
commit 694e9e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Speckle.Sdk/Serialisation/Utilities/ParallelOperationExecutor.cs b/src/Speckle.Sdk/Serialisation/Utilities/ParallelOperationExecutor.cs
@@ -12,6 +12,8 @@ internal abstract class ParallelOperationExecutor<TOperation> : IDisposable
   public int NumThreads { get; protected set; }
   public bool HasStarted => Threads.Count > 0;
 
+  protected volatile bool IsDisposed;
+
   protected abstract void ThreadMain();
 
   protected virtual void Stop()
@@ -56,6 +58,7 @@ public virtual void Dispose()
       Stop();
     }
 
+    IsDisposed = true;
     Tasks.Dispose();
   }
 }
diff --git a/src/Speckle.Sdk/Transports/ServerUtils/ParallelServerAPI.cs b/src/Speckle.Sdk/Transports/ServerUtils/ParallelServerAPI.cs
@@ -218,7 +218,13 @@ protected override void ThreadMain()
 
     while (true)
     {
+      if (IsDisposed)
+      {
+        return;
+      }
+
       var (operation, inputValue, tcs) = Tasks.Take();
+
       if (operation == ServerApiOperation.NoOp || tcs == null)
       {
         return;