yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made !, != true more robust when property may not exist on a node

Browse Source 
Fixed some cases of && breaking where the wrong number of parameters was passed to the LambdaExpression
This commit is contained in:
agrath@gmail.com
2011-03-25 09:34:39 -13:00
parent b198edeeaa
commit 9a56886f1d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs
View File

@@ -1097,7 +1097,14 @@ namespace System.Linq.Dynamic
{
ParameterExpression[] parameters = new ParameterExpression[(expr as LambdaExpression).Parameters.Count];
(expr as LambdaExpression).Parameters.CopyTo(parameters, 0);
expr = Expression.Lambda<Func<DynamicNode, bool>>(Expression.Not(Expression.Invoke(expr, parameters)), parameters);
var invokedExpr = Expression.Invoke(expr, parameters);
var not = Expression.Not(Expression.TypeAs(invokedExpr, typeof(Nullable<bool>)));
expr = Expression.Lambda<Func<DynamicNode, bool>>(
Expression.Condition(
Expression.Property(not, "HasValue"),
Expression.Property(not, "Value"),
Expression.Constant(false, typeof(bool))
), parameters);
}
else
{
@@ -2416,7 +2423,7 @@ namespace System.Linq.Dynamic
}
else
{
return (Expression.Lambda<Func<DynamicNode, DynamicNode, Boolean>>(Expression.AndAlso(finalLeft, finalRight), parameters));
return (Expression.Lambda<Func<DynamicNode, Boolean>>(Expression.AndAlso(finalLeft, finalRight), parameters));
}
case ExpressionType.OrElse:
if (leftIsLambda && rightIsLambda && sequenceEqual)