The subscription order in SkipUntil is reversed so in case source and…

… other emit elements right away, the first element of source is not missed out. (#530)
dotnet · May 25, 2018 · f54dbec · f54dbec
1 parent 4d63485
commit f54dbec
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable.Multiple.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable.Multiple.cs
@@ -1365,6 +1365,8 @@ public static IObservable<TSource> OnErrorResumeNext<TSource>(this IEnumerable<I
 
         /// <summary>
         /// Returns the elements from the source observable sequence only after the other observable sequence produces an element.
+        /// Starting from Rx.NET 4.0, this will subscribe to <paramref name="other"/> before subscribing to <paramref name="source" />
+        /// so in case <paramref name="other" /> emits an element right away, elements from <paramref name="source" /> are not missed.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <typeparam name="TOther">The type of the elements in the other sequence that indicates the end of skip behavior.</typeparam>

diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/SkipUntil.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/SkipUntil.cs
@@ -34,9 +34,9 @@ public IDisposable Run(SkipUntil<TSource, TOther> parent)
                 var sourceObserver = new SourceObserver(this);
                 var otherObserver = new OtherObserver(this, sourceObserver);
 
-                var sourceSubscription = parent._source.SubscribeSafe(sourceObserver);
                 var otherSubscription = parent._other.SubscribeSafe(otherObserver);
-
+                var sourceSubscription = parent._source.SubscribeSafe(sourceObserver);
+
                 sourceObserver.Disposable = sourceSubscription;
                 otherObserver.Disposable = otherSubscription;
 

diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableMultipleTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableMultipleTest.cs
@@ -9662,6 +9662,24 @@ public void SkipUntil_HasCompletedCausesDisposal()
             Assert.True(disposed, "disposed");
         }
 
+        [Fact]
+        public void SkipUntil_Immediate()
+        {
+            var scheduler = new TestScheduler();
+
+            var xs = Observable.Return(1);
+            var ys = Observable.Return("bar");
+
+            var res = scheduler.Start(() =>
+                xs.SkipUntil(ys)
+            );
+
+            res.Messages.AssertEqual(
+                OnNext(200, 1),
+                OnCompleted<int>(200)
+            );
+        }
+
         #endregion
 
         #region + Switch +