Remove the null check, fix issue #1755

OData · Sep 14, 2020 · 1314963 · 1314963
1 parent 4d55fe1
commit 1314963
Showing 1 changed file with 1 addition and 24 deletions.
diff --git a/src/Microsoft.AspNet.OData.Shared/Query/Expressions/SelectExpandBinder.cs b/src/Microsoft.AspNet.OData.Shared/Query/Expressions/SelectExpandBinder.cs
@@ -786,8 +786,6 @@ internal void BuildSelectedProperty(Expression source, IEdmStructuredType struct
                 return;
             }
 
-            Expression nullCheck = GetNullCheckExpression(structuralProperty, propertyValue, subSelectExpandClause);
-
             Expression countExpression = CreateTotalCountExpression(propertyValue, pathSelectItem.CountOption);
 
             // be noted: the property structured type could be null, because the property maybe not a complex property.
@@ -808,11 +806,7 @@ internal void BuildSelectedProperty(Expression source, IEdmStructuredType struct
             NamedPropertyExpression propertyExpression = new NamedPropertyExpression(propertyName, propertyValue);
             if (subSelectExpandClause != null)
             {
-                if (!structuralProperty.Type.IsCollection())
-                {
-                     propertyExpression.NullCheck = nullCheck;
-                }
-                else if (_settings.PageSize.HasValue)
+                if (structuralProperty.Type.IsCollection() && _settings.PageSize.HasValue)
                 {
                     propertyExpression.PageSize = _settings.PageSize.Value;
                 }
@@ -904,23 +898,6 @@ private Expression AddOrderByQueryForSource(Expression source, OrderByClause ord
             return source;
         }
 
-        private static Expression GetNullCheckExpression(IEdmStructuralProperty propertyToInclude, Expression propertyValue,
-            SelectExpandClause projection)
-        {
-            if (projection == null || propertyToInclude.Type.IsCollection())
-            {
-                return null;
-            }
-
-            if (IsSelectAll(projection) && propertyToInclude.Type.IsComplex())
-            {
-                // for Collections (Primitive, Enum, Complex collection), that's check above.
-                return Expression.Equal(propertyValue, Expression.Constant(null));
-            }
-
-            return null;
-        }
-
         private Expression GetNullCheckExpression(IEdmNavigationProperty propertyToExpand, Expression propertyValue,
             SelectExpandClause projection)
         {