Merge pull request #131 from Barsonax/feature/cleanuplistsinscopedisp…

…osal Dispose and finalizers are now properly emptied when a scope is disposed
Barsonax · Feb 16, 2020 · 5a5da5c · 5a5da5c
2 parents e39abd5 + e3bd05c
commit 5a5da5c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Singularity/Scoped.cs b/src/Singularity/Scoped.cs
@@ -177,14 +177,14 @@ internal T AddFinalizer<T>(T obj, ServiceBinding key)
         /// </summary>
         public void Dispose()
         {
-            SinglyLinkedListNode<IDisposable>? disposables = _disposables;
+            SinglyLinkedListNode<IDisposable>? disposables = Interlocked.Exchange(ref _disposables, null);
             while (disposables != null)
             {
                 disposables.Value.Dispose();
                 disposables = disposables.Next!;
             }
 
-            SinglyLinkedListKeyNode<ServiceBinding, ActionList<object>>? finalizers = _finalizers;
+            SinglyLinkedListKeyNode<ServiceBinding, ActionList<object>>? finalizers = Interlocked.Exchange(ref _finalizers, null);;
             while (finalizers != null)
             {
                 finalizers.Value.Invoke();