ReplaySubject race condition #228

Cysharp · Jun 25, 2024 · e016556 · e016556
1 parent d0ee86f
commit e016556
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/src/R3/ReplaySubject.cs b/src/R3/ReplaySubject.cs
@@ -56,11 +56,11 @@ public void OnNext(T value)
         {
             Trim();
             replayBuffer.AddLast((timeProvider?.GetTimestamp() ?? 0, value));
-        }
 
-        foreach (var subscription in list.AsSpan())
-        {
-            subscription?.observer.OnNext(value);
+            foreach (var subscription in list.AsSpan())
+            {
+                subscription?.observer.OnNext(value);
+            }
         }
     }
 
@@ -103,27 +103,27 @@ protected override IDisposable SubscribeCore(Observer<T> observer)
             {
                 observer.OnNext(item.value);
             }
-        }
 
-        var result = completeState.TryGetResult();
-        if (result != null)
-        {
-            observer.OnCompleted(result.Value);
-            return Disposable.Empty;
-        }
+            var result = completeState.TryGetResult();
+            if (result != null)
+            {
+                observer.OnCompleted(result.Value);
+                return Disposable.Empty;
+            }
 
-        var subscription = new Subscription(this, observer); // create subscription and add observer to list.
+            var subscription = new Subscription(this, observer); // create subscription and add observer to list.
 
-        // need to check called completed during adding
-        result = completeState.TryGetResult();
-        if (result != null)
-        {
-            subscription.observer.OnCompleted(result.Value);
-            subscription.Dispose();
-            return Disposable.Empty;
-        }
+            // need to check called completed during adding
+            result = completeState.TryGetResult();
+            if (result != null)
+            {
+                subscription.observer.OnCompleted(result.Value);
+                subscription.Dispose();
+                return Disposable.Empty;
+            }
 
-        return subscription;
+            return subscription;
+        }
     }
 
     public void Dispose()