[Fixes #5801] Move call to validate constructor in ComplexTypeModelBi…

…nder into CreateModel
aspnet · Feb 14, 2017 · a69fa27 · a69fa27
1 parent 531c11d
commit a69fa27
Showing 1 changed file with 20 additions and 23 deletions.
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinder.cs b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinder.cs
@@ -48,28 +48,6 @@ public Task BindModelAsync(ModelBindingContext bindingContext)
                 return TaskCache.CompletedTask;
             }
 
-            // The following check causes the ComplexTypeModelBinder to NOT participate in binding structs as 
-            // reflection does not provide information about the implicit parameterless constructor for a struct.
-            // This binder would eventually fail to construct an instance of the struct as the Linq's NewExpression
-            // compile fails to construct it.
-            var modelTypeInfo = bindingContext.ModelType.GetTypeInfo();
-            if (bindingContext.Model == null &&
-                (modelTypeInfo.IsAbstract ||
-                modelTypeInfo.GetConstructor(Type.EmptyTypes) == null))
-            {
-                if (bindingContext.IsTopLevelObject)
-                {
-                    throw new InvalidOperationException(
-                        Resources.FormatComplexTypeModelBinder_NoParameterlessConstructor_TopLevelObject(modelTypeInfo.FullName));
-                }
-
-                throw new InvalidOperationException(
-                    Resources.FormatComplexTypeModelBinder_NoParameterlessConstructor_ForProperty(
-                        modelTypeInfo.FullName,
-                        bindingContext.ModelName,
-                        bindingContext.ModelMetadata.ContainerType.FullName));
-            }
-
             // Perf: separated to avoid allocating a state machine when we don't
             // need to go async.
             return BindModelCoreAsync(bindingContext);
@@ -345,13 +323,32 @@ protected virtual object CreateModel(ModelBindingContext bindingContext)
             // application developer should know that this was an invalid type to try to bind to.
             if (_modelCreator == null)
             {
+                // The following check causes the ComplexTypeModelBinder to NOT participate in binding structs as 
+                // reflection does not provide information about the implicit parameterless constructor for a struct.
+                // This binder would eventually fail to construct an instance of the struct as the Linq's NewExpression
+                // compile fails to construct it.
+                var modelTypeInfo = bindingContext.ModelType.GetTypeInfo();
+                if (modelTypeInfo.IsAbstract || modelTypeInfo.GetConstructor(Type.EmptyTypes) == null)
+                {
+                    if (bindingContext.IsTopLevelObject)
+                    {
+                        throw new InvalidOperationException(
+                            Resources.FormatComplexTypeModelBinder_NoParameterlessConstructor_TopLevelObject(modelTypeInfo.FullName));
+                    }
+
+                    throw new InvalidOperationException(
+                        Resources.FormatComplexTypeModelBinder_NoParameterlessConstructor_ForProperty(
+                            modelTypeInfo.FullName,
+                            bindingContext.ModelName,
+                            bindingContext.ModelMetadata.ContainerType.FullName));
+                }
+
                 _modelCreator = Expression
                     .Lambda<Func<object>>(Expression.New(bindingContext.ModelType))
                     .Compile();
             }
 
             return _modelCreator();
-
         }
 
         /// <summary>