Fix a return error issue

chinadragon0515 · Aug 2, 2016 · a801c05 · a801c05
1 parent 6b061d8
commit a801c05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Microsoft.Restier.Core/Query/DefaultQueryHandler.cs b/src/Microsoft.Restier.Core/Query/DefaultQueryHandler.cs
@@ -215,7 +215,7 @@ private static MethodCallExpression CheckWhereCondition(MethodCallExpression met
 
             // Key segment will have ConstantExpression but $filter will not have ConstantExpression
             var rightExpression = binaryExpression.Right as ConstantExpression;
-            if (rightExpression != null)
+            if (rightExpression != null && rightExpression.Value != null)
             {
                 // This means where statement is key segment but not for $filter
                 throw new ResourceNotFoundException(Resources.ResourceNotFound);

diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/PropertyAccessTests.cs b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/PropertyAccessTests.cs
@@ -252,6 +252,8 @@ public void QueryNullRawEnumPropertyOfSingleEntity()
         [Theory]
         // Filter with no result, them empty collection returned. 
         [InlineData("/People?$filter=LastName eq 'xxx'", 200)]
+        // No result, should return empty collection
+        [InlineData("/People?$filter=LastName eq null", 200)]
         // Filter cause no result returned. 
         [InlineData("/People(1)?$filter=LastName eq 'xxx'", 204)]
         // Single primitive property with null value