well advanced null checking on select expression big deal! :D

2018-04-04 21:57:40 -05:00
parent 1be2458591
commit 13576133b5
2 changed files with 112 additions and 25 deletions
@@ -434,8 +434,10 @@ namespace PoweredSoft.DynamicLinq.Helpers
                if (nullCheckExpression != null)
                {
                    var pathExpr = InternalCreateConditionExpression(recursionStep, type, parameter, memberExpression, parts.Skip(1).ToList(), condition, value, convertStrategy, collectionHandling, nullChecking, stringComparison);
-                    var nullCheckResult = Expression.AndAlso(nullCheckExpression, pathExpr);
-                    return nullCheckResult;
+                    
+                    var nullCheckResult = Expression.AndAlso(nullCheckExpression, (pathExpr as LambdaExpression).Body);
+                    var nullCheckResultLambda = Expression.Lambda((Expression)nullCheckResult, parameter);
+                    return nullCheckResultLambda;
                }

                return InternalCreateConditionExpression(recursionStep, type, parameter, memberExpression, parts.Skip(1).ToList(), condition, value, convertStrategy, collectionHandling, nullChecking, stringComparison);