Merge pull request #134 from robsonj/master

#128 - Filter(reapplyFilter) throws an ArgumentNullException
reactivemarbles · Jul 13, 2018 · 9d25a09 · 9d25a09
2 parents 9c2ab0d + e556db9
commit 9d25a09
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/DynamicData.Tests/Cache/FilterControllerFixture.cs b/DynamicData.Tests/Cache/FilterControllerFixture.cs
@@ -47,6 +47,20 @@ public void ChangeFilter()
             _results.Data.Items.All(p => p.Age <= 50).Should().BeTrue();
         }
 
+        [Fact]
+        public void ReapplyFilterDoesntThrow()
+        {
+            using (var source = new SourceCache<Person, string>(p => p.Key))
+            {
+                source.AddOrUpdate(Enumerable.Range(1, 100).Select(i => new Person("P" + i, i)).ToArray());
+
+                var ex = Record.Exception(() => source.Connect()
+                    .Filter(Observable.Return(Unit.Default))
+                    .AsObservableCache());
+                Assert.Null(ex);
+            }
+        }
+
         [Fact]
         public void RepeatedApply()
         {

diff --git a/DynamicData/Cache/ObservableCacheEx.cs b/DynamicData/Cache/ObservableCacheEx.cs
@@ -1478,7 +1478,8 @@ public static IObservable<IReadOnlyCollection<T>> StartWithEmpty<T>(this IObserv
         {
             if (source == null) throw new ArgumentNullException(nameof(source));
             if (reapplyFilter == null) throw new ArgumentNullException(nameof(reapplyFilter));
-            return new DynamicFilter<TObject, TKey>(source, null, reapplyFilter).Run();
+            var empty = Observable.Empty<Func<TObject, bool>>();
+            return new DynamicFilter<TObject, TKey>(source, empty, reapplyFilter).Run();
         }