Fix file storage read lock (#110)

SwissLife-OSS · May 15, 2020 · 7b66fae · 7b66fae
1 parent d6b0c6a
commit 7b66fae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/Core/Transmission.Abstractions/AsyncLock.cs b/src/Core/Transmission.Abstractions/AsyncLock.cs
@@ -17,6 +17,8 @@ internal async ValueTask<Releaser> LockAsync(CancellationToken cancellationToken
 
         internal struct Releaser : IDisposable
         {
+            internal static Releaser Empty = new Releaser(new AsyncLock());
+
             private readonly AsyncLock _asyncLock;
             private bool _isDisposed;
 

diff --git a/src/Core/Transmission.Abstractions/FilesLock.cs b/src/Core/Transmission.Abstractions/FilesLock.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -35,13 +34,20 @@ internal static async ValueTask<Releaser> ReadLockAsync(
                 throw new ArgumentNullException(nameof(fileName));
             }
 
-            Files.TryRemove(fileName, out AsyncLock asyncLock);
-            Debug.WriteLine(Files.Count);
-            return new Releaser(await asyncLock.LockAsync(cancellationToken));
+            if (Files.ContainsKey(fileName))
+            {
+                Files.TryRemove(fileName, out AsyncLock asyncLock);
+
+                return new Releaser(await asyncLock.LockAsync(cancellationToken));
+            }
+
+            return Releaser.Empty;
         }
 
         internal struct Releaser : IDisposable
         {
+            internal static Releaser Empty = new Releaser(AsyncLock.Releaser.Empty);
+
             private AsyncLock.Releaser _releaser;
 
             internal Releaser(AsyncLock.Releaser releaser)