From b66e2c33d08bb021c9c40d0904b25f16dff36bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= Date: Wed, 17 Jan 2018 15:10:32 +0100 Subject: [PATCH] Avoid a null reference exception in ExpressionKeyVisitor --- src/NHibernate/Linq/Visitors/ExpressionKeyVisitor.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/NHibernate/Linq/Visitors/ExpressionKeyVisitor.cs b/src/NHibernate/Linq/Visitors/ExpressionKeyVisitor.cs index 95a40181595..483d0dcc796 100644 --- a/src/NHibernate/Linq/Visitors/ExpressionKeyVisitor.cs +++ b/src/NHibernate/Linq/Visitors/ExpressionKeyVisitor.cs @@ -81,6 +81,8 @@ protected override Expression VisitConstant(ConstantExpression expression) { NamedParameter param; + if (_constantToParameterMap == null) + throw new InvalidOperationException("Cannot visit a constant without a constant to parameter map."); if (_constantToParameterMap.TryGetValue(expression, out param) && insideSelectClause == false) { // Nulls generate different query plans. X = variable generates a different query depending on if variable is null or not. @@ -243,4 +245,4 @@ private void VisitMethod(MethodInfo methodInfo) } } } -} \ No newline at end of file +}