hardening the code against a try find service family miss. Closes GH-340

JasperFx · Sep 28, 2023 · e8425a0 · e8425a0
1 parent a8f6abd
commit e8425a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Lamar.Testing/Bugs/Bug_340_open_generic_interface_registration_check.cs b/src/Lamar.Testing/Bugs/Bug_340_open_generic_interface_registration_check.cs
@@ -12,7 +12,7 @@ interface IGenericService<T> {}
     class ServiceA : IGenericService<ClassA> {}
 
     [Fact]
-    public void Test_it()
+    public void do_not_blow_up()
     {
         var container = new Container(x =>
         {
@@ -24,7 +24,9 @@ public void Test_it()
         container.GetInstance<IGenericService<ClassA>>()
             .ShouldNotBeNull();
 
+        // This should return false. There's no registration for the 
+        // open type, only a specific closed type
         container.Model.HasRegistrationFor(typeof(IGenericService<>))
-            .ShouldBeTrue();
+            .ShouldBeFalse();
     }
 }
diff --git a/src/Lamar/ServiceGraph.cs b/src/Lamar/ServiceGraph.cs
@@ -296,7 +296,8 @@ private ServiceFamily buildClosedGenericType(Type serviceType, IServiceCollectio
 
     public IEnumerable<Instance> AllInstances()
     {
-        return _families.Enumerate().Select(x => x.Value).ToArray().SelectMany(x => x.All).ToArray();
+        var serviceFamilies = _families.Enumerate().Select(x => x.Value).Where(x => x != null).ToArray();
+        return serviceFamilies.SelectMany(x => x.All).ToArray();
     }
 
     public bool HasFamily(Type serviceType)