Merge pull request #4 from OlegShatin/patch-1

NRE for FromQuery fixed
unchase · Dec 26, 2019 · 4cc2107 · 4cc2107
2 parents 5a9fd7d + 7b1865a
commit 4cc2107
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Unchase.Swashbuckle.AspNetCore.Extensions/Filters/XEnumNamesParameterFilter.cs b/src/Unchase.Swashbuckle.AspNetCore.Extensions/Filters/XEnumNamesParameterFilter.cs
@@ -8,10 +8,10 @@ public class XEnumNamesParameterFilter : IParameterFilter
     {
         public void Apply(IParameter parameter, ParameterFilterContext context)
         {
-            var typeInfo = context.ParameterInfo.ParameterType;
+            var typeInfo = context.ParameterInfo?.ParameterType?? context.PropertyInfo.PropertyType;
             if (typeInfo.IsEnum)
             {
-                var names = Enum.GetNames(context.ParameterInfo.ParameterType);
+                var names = Enum.GetNames(typeInfo);
                 parameter.Extensions.Add("x-enumNames", names);
             }
             else if (typeInfo.IsGenericType && !parameter.Extensions.ContainsKey("x-enumNames"))