Avoid throwing exceptions after resource disposal (#501)

Changed the PropertyChanged method in the PropertyChangedObservable class to return instead of throwing an InvalidOperationException when _isDisposed is true. Added a return check in the SourcePropertyChangedEventHandler method of the PropertyPathNode class when _isDisposed is true. Changed the PropertyChanged method in the SimplePropertyObservable class to return instead of throwing an InvalidOperationException when _isDisposed is true.
runceel · Jan 27, 2025 · 6c76130 · 6c76130
1 parent eb92dc2
commit 6c76130
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Source/ReactiveProperty.Core/Internals/PropertyChangedObservable.cs b/Source/ReactiveProperty.Core/Internals/PropertyChangedObservable.cs
@@ -31,7 +31,7 @@ public Subscription(INotifyPropertyChanged notifyPropertyChanged, IObserver<Prop
 
         private void PropertyChanged(object? _, PropertyChangedEventArgs e)
         {
-            if (_isDisposed) throw new InvalidOperationException();
+            if (_isDisposed) return;
             _observer.OnNext(e);
         }
 

diff --git a/Source/ReactiveProperty.Core/Internals/PropertyPathNode.cs b/Source/ReactiveProperty.Core/Internals/PropertyPathNode.cs
@@ -113,6 +113,7 @@ public bool SetPropertyPathValue(object? value)
 
     private void SourcePropertyChangedEventHandler(object? sender, PropertyChangedEventArgs e)
     {
+        if (_isDisposed) return;
         if (e.PropertyName == PropertyName || string.IsNullOrEmpty(e.PropertyName))
         {
             Next?.UpdateSource(GetPropertyValue());

diff --git a/Source/ReactiveProperty.Core/Internals/SimplePropertyObservable.cs b/Source/ReactiveProperty.Core/Internals/SimplePropertyObservable.cs
@@ -60,8 +60,8 @@ public Subscription(TSubject subject, Func<TSubject, TProperty> accessor, string
 
         private void PropertyChanged(object? sender, PropertyChangedEventArgs e)
         {
+            if (_isDisposed) return;
             if (e.PropertyName != _propertyName && !string.IsNullOrEmpty(e.PropertyName)) return;
-            if (_isDisposed) throw new InvalidOperationException();
 
             try
             {