Fixes for awaiting in Append.

cpraehaus · Sep 26, 2017 · cad34bd · cad34bd
1 parent db9f608
commit cad34bd
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/AsyncRx.NET/System.Reactive.Async.Linq/System/Reactive/Linq/Operators/Append.cs b/AsyncRx.NET/System.Reactive.Async.Linq/System/Reactive/Linq/Operators/Append.cs
@@ -48,7 +48,7 @@ public static IAsyncObservable<TSource> Append<TSource>(this IAsyncObservable<TS
             if (values == null)
                 throw new ArgumentNullException(nameof(values));
 
-            return Create<TSource>(async observer => await source.SubscribeSafeAsync(AsyncObserver.Append(observer, values)));
+            return Create<TSource>(observer => source.SubscribeSafeAsync(AsyncObserver.Append(observer, values)));
         }
 
         public static IAsyncObservable<TSource> Append<TSource>(this IAsyncObservable<TSource> source, IAsyncScheduler scheduler, params TSource[] values)
@@ -83,7 +83,7 @@ public static IAsyncObservable<TSource> Append<TSource>(this IAsyncObservable<TS
             if (values == null)
                 throw new ArgumentNullException(nameof(values));
 
-            return Create<TSource>(async observer => await source.SubscribeSafeAsync(AsyncObserver.Append(observer, values)));
+            return Create<TSource>(observer => source.SubscribeSafeAsync(AsyncObserver.Append(observer, values)));
         }
 
         public static IAsyncObservable<TSource> Append<TSource>(this IAsyncObservable<TSource> source, IAsyncScheduler scheduler, IEnumerable<TSource> values)
@@ -124,8 +124,8 @@ public static IAsyncObserver<TSource> Append<TSource>(IAsyncObserver<TSource> ob
                 observer.OnErrorAsync,
                 async () =>
                 {
-                    await observer.OnNextAsync(value);
-                    await observer.OnCompletedAsync();
+                    await observer.OnNextAsync(value).ConfigureAwait(false);
+                    await observer.OnCompletedAsync().ConfigureAwait(false);
                 }
             );
         }
@@ -150,8 +150,8 @@ public static (IAsyncObserver<TSource>, IAsyncDisposable) Append<TSource>(IAsync
                             {
                                 if (!ct.IsCancellationRequested)
                                 {
-                                    await observer.OnNextAsync(value);
-                                    await observer.OnCompletedAsync();
+                                    await observer.OnNextAsync(value).RendezVous(scheduler, ct);
+                                    await observer.OnCompletedAsync().RendezVous(scheduler, ct);
                                 }
                             }).ConfigureAwait(false);
 
@@ -176,10 +176,10 @@ public static IAsyncObserver<TSource> Append<TSource>(IAsyncObserver<TSource> ob
                 {
                     foreach (var value in values)
                     {
-                        await observer.OnNextAsync(value);
+                        await observer.OnNextAsync(value).ConfigureAwait(false);
                     }
 
-                    await observer.OnCompletedAsync();
+                    await observer.OnCompletedAsync().ConfigureAwait(false);
                 }
             );
         }
@@ -210,10 +210,10 @@ public static IAsyncObserver<TSource> Append<TSource>(IAsyncObserver<TSource> ob
                 {
                     foreach (var value in values)
                     {
-                        await observer.OnNextAsync(value);
+                        await observer.OnNextAsync(value).ConfigureAwait(false);
                     }
 
-                    await observer.OnCompletedAsync();
+                    await observer.OnCompletedAsync().ConfigureAwait(false);
                 }
             );
         }