PR #1045: Fix #1040 - IsRegistered throws IndexOutOfRangeException fo…

…r open generic type
autofac · Nov 20, 2019 · 13ea57d · 13ea57d
2 parents cf28582 + fb145e4
commit 13ea57d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Autofac/Features/OpenGenerics/OpenGenericServiceBinder.cs b/src/Autofac/Features/OpenGenerics/OpenGenericServiceBinder.cs
@@ -44,7 +44,7 @@ public static bool TryBindServiceType(
             out Service[] constructedServices)
         {
             var swt = service as IServiceWithType;
-            if (swt != null && swt.ServiceType.GetTypeInfo().IsGenericType)
+            if (swt != null && swt.ServiceType.GetTypeInfo().IsGenericType && !swt.ServiceType.IsGenericTypeDefinition)
             {
                 var definitionService = (IServiceWithType)swt.ChangeType(swt.ServiceType.GetGenericTypeDefinition());
                 var serviceGenericArguments = swt.ServiceType.GetTypeInfo().GenericTypeArguments;

diff --git a/test/Autofac.Test/Features/OpenGenerics/ComplexGenericsTests.cs b/test/Autofac.Test/Features/OpenGenerics/ComplexGenericsTests.cs
@@ -341,6 +341,17 @@ public void ResolveTypeFromOpenGenericInterfaceTypeParameterIsInterfaceWithConst
             var instance = container.Resolve<INested<ISimpleInterface>>();
         }
 
+        [Fact]
+        public void CheckGenericTypeIsRegisteredWhenNotSpecifyParameterType()
+        {
+            // Issue #1040: IsRegistered throws IndexOutOfRangeException for open generic type
+            var cb = new ContainerBuilder();
+            cb.RegisterGeneric(typeof(C<>));
+            var container = cb.Build();
+
+            Assert.False(container.IsRegistered(typeof(C<>)));
+        }
+
         private class CNestedSimpleInterface : INested<ISimpleInterface>
         {
         }