Skip to content

ObservableAsPropertyHelper.Value throws ArgumentNullException #2455 #2456

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 2 commits into from
Jul 24, 2020
Merged

ObservableAsPropertyHelper.Value throws ArgumentNullException #2455 #2456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db3adaa
fix: avoid throwing ArgumentNullException from OAPH.Value (#2455)
Jul 23, 2020
e2bffe9
docs: remove duplicate words in OAPH documentation
Jul 23, 2020
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
19 changes: 19 additions & 0 deletions src/ReactiveUI.Tests/ObservableAsPropertyHelper/ObservableAsPropertyHelperTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,25 @@ public void OAPHDeferSubscriptionParameterIsSubscribedIsNotTrueInitially()
Assert.True(fixture.IsSubscribed);
}

[Fact]
public void OAPHDeferSubscriptionShouldNotThrowIfDisposed()
{
var observable = Observable.Create<int>(o =>
{
o.OnNext(42);
o.OnCompleted();

return Disposable.Empty;
});

var fixture = new ObservableAsPropertyHelper<int>(observable, _ => { }, 0, true);

Assert.False(fixture.IsSubscribed);
fixture.Dispose();
var ex = Record.Exception(() => Assert.Equal(0, fixture.Value));
Assert.Null(ex);
}

[Fact]
public void OAPHShouldRethrowErrors()
{
Expand Down
11 changes: 8 additions & 3 deletions src/ReactiveUI/ObservableForProperty/ObservableAsPropertyHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public sealed class ObservableAsPropertyHelper<T> : IHandleObservableErrors, IDi
/// A value indicating whether the <see cref="ObservableAsPropertyHelper{T}"/>
/// should defer the subscription to the <paramref name="observable"/> source
/// until the first call to <see cref="Value"/>, or if it should immediately
/// subscribe to the the <paramref name="observable"/> source.
/// subscribe to the <paramref name="observable"/> source.
/// </param>
/// <param name="scheduler">
/// The scheduler that the notifications will be provided on -
Expand Down Expand Up @@ -85,7 +85,7 @@ public ObservableAsPropertyHelper(
/// A value indicating whether the <see cref="ObservableAsPropertyHelper{T}"/>
/// should defer the subscription to the <paramref name="observable"/> source
/// until the first call to <see cref="Value"/>, or if it should immediately
/// subscribe to the the <paramref name="observable"/> source.
/// subscribe to the <paramref name="observable"/> source.
/// </param>
/// <param name="scheduler">
/// The scheduler that the notifications will provided on - this
Expand Down Expand Up @@ -136,7 +136,12 @@ public T Value
{
if (Interlocked.CompareExchange(ref _activated, 1, 0) == 0)
{
_source.Subscribe(_subject).DisposeWith(_disposable);
// Do not subscribe if disposed
var localReferenceInCaseDisposeIsCalled = _disposable;
if (localReferenceInCaseDisposeIsCalled != null)
{
_source.Subscribe(_subject).DisposeWith(localReferenceInCaseDisposeIsCalled);
}
}

return _lastValue;
Expand Down