Removed redundant retain.

timcassell · Sep 10, 2023 · 0e55853 · 0e55853
1 parent c224cec
commit 0e55853
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/Package/Core/Promises/Internal/MergeInternal.cs b/Package/Core/Promises/Internal/MergeInternal.cs
@@ -56,18 +56,13 @@ protected bool RemoveWaiterAndGetIsComplete()
 
                 protected void ReleaseAndHandleNext(object rejectContainer, Promise.State state)
                 {
-                    // Decrement retain counter instead of calling MaybeDispose, since we know the next handler will call MaybeDispose.
-                    InterlockedAddWithUnsignedOverflowCheck(ref _retainCounter, -1);
                     HandleNextInternal(rejectContainer, state);
                 }
 
                 protected void Setup(ValueLinkedStack<PromisePassThrough> promisePassThroughs, int pendingAwaits, ushort depth)
                 {
                     _waitCount = pendingAwaits;
-                    unchecked
-                    {
-                        _retainCounter = pendingAwaits + 1;
-                    }
+                    _retainCounter = pendingAwaits;
                     Reset(depth);
 
                     _passThroughs = promisePassThroughs;

diff --git a/Package/Core/Promises/Internal/PromiseFieldsInternal.cs b/Package/Core/Promises/Internal/PromiseFieldsInternal.cs
@@ -429,7 +429,7 @@ partial class CancelablePromiseCancelPromise<TResult, TCanceler> : PromiseWaitPr
 #region Multi Promises
             partial class MultiHandleablePromiseBase<TResult> : PromiseSingleAwait<TResult>
             {
-                volatile protected int _waitCount;
+                protected int _waitCount;
                 protected int _retainCounter;
                 // We store the passthroughs for lazy progress subscribe.
                 // The passthroughs will be released when this has fully released if a progress listener did not do it already.