Skip to content

Save one static per-generic-class field. #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 4, 2018
Merged

Save one static per-generic-class field. #758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/RetryWhen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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();
}
Expand Down Expand Up @@ -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);
}
Expand Down