Fixed race condition

MarkCiliaVincenti · Dec 30, 2022 · f8727c2 · f8727c2
1 parent a164747
commit f8727c2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/AsyncKeyedLock/AsyncKeyedLock.csproj b/AsyncKeyedLock/AsyncKeyedLock.csproj
@@ -8,7 +8,7 @@
 		<PackageProjectUrl>https://github.com/MarkCiliaVincenti/AsyncKeyedLock</PackageProjectUrl>
 		<Copyright>MIT</Copyright>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<Version>6.0.4-rc5</Version>
+		<Version>6.0.4-rc6</Version>
 		<PackageIcon>logo.png</PackageIcon>
 		<PackageReleaseNotes>Optimizations and fixing of more rare race conditions.</PackageReleaseNotes>
 		<Description>An asynchronous .NET Standard 2.0 library that allows you to lock based on a key (keyed semaphores), limiting concurrent threads sharing the same key to a specified number.</Description>

diff --git a/AsyncKeyedLock/AsyncKeyedLockDictionary.cs b/AsyncKeyedLock/AsyncKeyedLockDictionary.cs
@@ -82,7 +82,7 @@ public AsyncKeyedLockReleaser<TKey> GetOrAdd(TKey key)
         {
             if (PoolingEnabled)
             {
-                if (TryGetValue(key, out var releaser) && releaser.TryIncrement())
+                if (TryGetValue(key, out var releaser) && releaser.TryIncrement(key))
                 {
                     return releaser;
                 }
@@ -100,7 +100,7 @@ public AsyncKeyedLockReleaser<TKey> GetOrAdd(TKey key)
                     {
                         return releaser;
                     }
-                    if (releaser.TryIncrement())
+                    if (releaser.TryIncrement(key))
                     {
                         releaser.IsPooled = true;
                         _pool.PutObject(releaserToAdd);

diff --git a/AsyncKeyedLock/AsyncKeyedLockReleaser.cs b/AsyncKeyedLock/AsyncKeyedLockReleaser.cs
@@ -50,11 +50,11 @@ internal AsyncKeyedLockReleaser(TKey key, SemaphoreSlim semaphoreSlim, AsyncKeye
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal bool TryIncrement()
+        internal bool TryIncrement(TKey key)
         {
             if (Monitor.TryEnter(this))
             {
-                if (IsPooled) // rare race condition
+                if (IsPooled || !_key.Equals(key)) // rare race condition
                 {
                     Monitor.Exit(this);
                     return false;