Merge pull request #272 from timothycoleman/fix-cancellation-token-multiplexer-pooling

Fix CancellationTokenMultiplexer return to pool

Author: sakno

src/DotNext.Tests/Threading/CancellationTokenMultiplexerTests.cs

@@ -40,6 +40,23 @@ public static void CheckPooling()
         }
     }
 
+    [Fact]
+    public async Task CheckPoolingNonInterference()
+    {
+        var multiplexer = new CancellationTokenMultiplexer();
+
+        using var cts = new CancellationTokenSource();
+
+        await multiplexer.Combine([cts.Token, cts.Token, cts.Token]).DisposeAsync();
+
+        // same source is reused from pool, but should now not be associated with cts.
+        await using var combined = multiplexer.Combine([new(), new(), new()]);
+
+        cts.Cancel();
+
+        False(combined.Token.IsCancellationRequested);
+    }
+
     [Fact]
     public static void ExtraListOverflow()
     {

src/DotNext.Threading/Threading/CancellationTokenMultiplexer.CTS.cs

@@ -37,7 +37,7 @@ private void Add(CancellationTokenRegistration registration)
         private ref CancellationTokenRegistration FirstInlinedRegistration
             => ref Unsafe.As<InlinedTokenList, CancellationTokenRegistration>(ref inlinedList);
 
-        public int Count => inlinedTokenCount + extraTokens?.Count ?? 0;
+        public int Count => inlinedTokenCount + (extraTokens?.Count ?? 0);
 
         public ref CancellationTokenRegistration this[int index]
         {