KeyDrivenObservableSeries - check 'is_disposed' before subscribing to next inner observable

This commit is contained in:
John Colvin committed 2018-10-01 14:28:51 -04:00
1 parent 51cc64f031
commit 2da1644f8e
1 file changed
+9 -4
@@ -17,7 +17,8 @@ namespace mbts.utils {
/// <seealso cref="Observable.SelectMany"/>
class KeyDrivenObservableSeries<TKey, TValue> : ISubject<TKey, TValue>, IDisposable {
readonly Func<TKey, IObservable<TValue>> _selector;
object _lock = new object();
readonly object _lock = new object();
bool _is_disposed;
Subject<TValue> _value_subject = new Subject<TValue>();
IDisposable _current_key_sub;
@@ -31,15 +32,19 @@ namespace mbts.utils {
// need to lock bc simultaneous callbacks on diff threads could generate 2 subscriptions at once,
// only 1 of which would get disposed in the next callback.
Disposable.dispose(ref _current_key_sub);
_current_key_sub = _selector(key)?.Subscribe(_value_subject);
if (!_is_disposed)
_current_key_sub = _selector(key)?.Subscribe(_value_subject);
}
}
public IDisposable Subscribe(IObserver<TValue> observer) => _value_subject.Subscribe(observer);
public void Dispose() {
Disposable.dispose(ref _current_key_sub);
Disposable.dispose(ref _value_subject);
lock (_lock) {
_is_disposed = true;
Disposable.dispose(ref _current_key_sub);
Disposable.dispose(ref _value_subject);
}
}
}