Ensure that elementType is not null when calling elementType.IsUntyped()

OData · Feb 29, 2024 · 6dc9066 · 6dc9066
1 parent d4aa9a5
commit 6dc9066
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/Microsoft.AspNetCore.OData/Query/EnableQueryAttribute.cs b/src/Microsoft.AspNetCore.OData/Query/EnableQueryAttribute.cs
@@ -137,14 +137,6 @@ protected virtual ODataQueryOptions CreateQueryOptionsOnExecuting(ActionExecutin
                 }
 
                 IEdmType elementType = edmType.AsElementType();
-                if (elementType.IsUntyped())
-                {
-                    // TODO: so far, we don't know how to process query on Edm.Untyped.
-                    // So, if the query data type is Edm.Untyped, or collection of Edm.Untyped,
-                    // Let's simply skip it now.
-                    return null;
-                }
-
                 IEdmModel edmModel = request.GetModel();
 
                 // For Swagger metadata request. elementType is null.
@@ -153,6 +145,14 @@ protected virtual ODataQueryOptions CreateQueryOptionsOnExecuting(ActionExecutin
                     return null;
                 }
 
+                if (elementType.IsUntyped())
+                {
+                    // TODO: so far, we don't know how to process query on Edm.Untyped.
+                    // So, if the query data type is Edm.Untyped, or collection of Edm.Untyped,
+                    // Let's simply skip it now.
+                    return null;
+                }
+
                 Type clrType = edmModel.GetClrType(elementType.ToEdmTypeReference(isNullable: false));
 
                 // CLRType can be missing if untyped registrations were made.