From 413dfbbba97e7ca62041a7951b12e9f5976f6a64 Mon Sep 17 00:00:00 2001
From: Tim <cassell.timothy@gmail.com>
Date: Fri, 13 Jan 2023 22:05:23 -0500
Subject: [PATCH] Release the factory delegate when the result has been
 obtained.

---
 src/Nito.AsyncEx.Coordination/AsyncLazy.cs | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/Nito.AsyncEx.Coordination/AsyncLazy.cs b/src/Nito.AsyncEx.Coordination/AsyncLazy.cs
index db9811b..a69fd93 100644
--- a/src/Nito.AsyncEx.Coordination/AsyncLazy.cs
+++ b/src/Nito.AsyncEx.Coordination/AsyncLazy.cs
@@ -40,11 +40,6 @@ public sealed class AsyncLazy<T>
         /// </summary>
         private readonly object _mutex;
 
-        /// <summary>
-        /// The factory method to call.
-        /// </summary>
-        private readonly Func<Task<T>> _factory;
-
         /// <summary>
         /// The underlying lazy task.
         /// </summary>
@@ -77,14 +72,13 @@ public AsyncLazy(Func<Task<T>> factory, AsyncLazyFlags flags = AsyncLazyFlags.No
         {
             if (factory == null)
                 throw new ArgumentNullException(nameof(factory));
-            _factory = factory;
-            if ((flags & AsyncLazyFlags.RetryOnFailure) == AsyncLazyFlags.RetryOnFailure)
-                _factory = RetryOnFailure(_factory);
             if ((flags & AsyncLazyFlags.ExecuteOnCallingThread) != AsyncLazyFlags.ExecuteOnCallingThread)
-                _factory = RunOnThreadPool(_factory);
+                factory = RunOnThreadPool(factory);
+            if ((flags & AsyncLazyFlags.RetryOnFailure) == AsyncLazyFlags.RetryOnFailure)
+                factory = RetryOnFailure(factory);
 
             _mutex = new object();
-            _instance = new Lazy<Task<T>>(_factory);
+            _instance = new Lazy<Task<T>>(factory);
         }
 
         /// <summary>
@@ -121,17 +115,18 @@ public Task<T> Task
 
         private Func<Task<T>> RetryOnFailure(Func<Task<T>> factory)
         {
-            return async () =>
+            var originalFactory = factory;
+            return factory = async () =>
             {
                 try
                 {
-                    return await factory().ConfigureAwait(false);
+                    return await originalFactory().ConfigureAwait(false);
                 }
                 catch
                 {
                     lock (_mutex)
                     {
-                        _instance = new Lazy<Task<T>>(_factory);
+                        _instance = new Lazy<Task<T>>(factory);
                     }
                     throw;
                 }