fix(storage): Make the AsyncOperation ID really unique

unoplatform · Oct 9, 2020 · c65e55e · c65e55e
1 parent 0d8fe25
commit c65e55e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Uno.Foundation/AsyncOperation.TResult.cs b/src/Uno.Foundation/AsyncOperation.TResult.cs
@@ -16,8 +16,6 @@ internal class AsyncOperation<TResult> : IAsyncOperation<TResult>, IAsyncOperati
 		public static AsyncOperation<TResult> FromTask(FuncAsync<AsyncOperation<TResult>, TResult> builder)
 			=> new AsyncOperation<TResult>(builder);
 
-		private static long _nextId;
-
 		private readonly CancellationTokenSource _cts = new CancellationTokenSource();
 		private AsyncOperationCompletedHandler<TResult>? _onCompleted;
 		private AsyncStatus _status;
@@ -58,7 +56,7 @@ public AsyncOperationCompletedHandler<TResult>? Completed
 			}
 		}
 
-		public uint Id { get; } = (uint)Interlocked.Increment(ref _nextId);
+		public uint Id { get; } = AsyncOperation.CreateId();
 
 		public Task<TResult> Task { get; }
 

diff --git a/src/Uno.Foundation/AsyncOperation.cs b/src/Uno.Foundation/AsyncOperation.cs
@@ -12,6 +12,10 @@ namespace Windows.Foundation
 {
 	internal static class AsyncOperation
 	{
+		private static long _nextId;
+		internal static uint CreateId()
+			=> (uint)Interlocked.Increment(ref _nextId);
+
 		public static AsyncOperation<TResult> FromTask<TResult>(Func<CancellationToken, Task<TResult>> builder)
 			=> new AsyncOperation<TResult>((ct, _) => builder(ct));
 	}