Merge pull request #758 from danielcweber/SaveStaticPerGenericClassField

Save one static per-generic-class field.
dotnet · Jul 4, 2018 · 064b865 · 064b865
2 parents fcd8d27 + d011957
commit 064b865
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/RetryWhen.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/RetryWhen.cs
@@ -161,7 +161,6 @@ internal sealed class RedoSerializedObserver<X> : IObserver<X>
         private readonly IObserver<X> _downstream;
         private int _wip;
         private Exception _terminalException;
-        private static readonly Exception DoneIndicator = new Exception();
         private static readonly Exception SignaledIndicator = new Exception();
         private readonly ConcurrentQueue<X> _queue;
 
@@ -173,7 +172,7 @@ internal RedoSerializedObserver(IObserver<X> downstream)
 
         public void OnCompleted()
         {
-            if (Interlocked.CompareExchange(ref _terminalException, DoneIndicator, null) == null)
+            if (Interlocked.CompareExchange(ref _terminalException, ExceptionHelper.Terminated, null) == null)
             {
                 Drain();
             }
@@ -218,7 +217,7 @@ private void Drain()
                     if (ex != SignaledIndicator)
                     {
                         Interlocked.Exchange(ref _terminalException, SignaledIndicator);
-                        if (ex != DoneIndicator)
+                        if (ex != ExceptionHelper.Terminated)
                         {
                             _downstream.OnError(ex);
                         }