From 7575b8b1b289acd813b6e8678853c46e036f4e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= <fredericdelaporte@free.fr>
Date: Sun, 21 Jan 2018 14:26:38 +0100
Subject: [PATCH] Add a missing short circuit in query parameter expansion.

 * This should have been the fix for NH-3050.
---
 src/NHibernate/Impl/ExpressionQueryImpl.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/NHibernate/Impl/ExpressionQueryImpl.cs b/src/NHibernate/Impl/ExpressionQueryImpl.cs
index f647ba2a076..c4cce671ef4 100644
--- a/src/NHibernate/Impl/ExpressionQueryImpl.cs
+++ b/src/NHibernate/Impl/ExpressionQueryImpl.cs
@@ -66,6 +66,13 @@ protected override IQueryExpression ExpandParameters(IDictionary<string, TypedVa
 				map.Add(name, aliases);
 			}
 
+			if (map.Count == 0)
+			{
+				// No list parameter needs to be replaced: they are all single valued. They just need
+				// to be retyped, which has been done above.
+				return QueryExpression;
+			}
+
 			//TODO: Do we need to translate expression one more time here?
 			var newTree = ParameterExpander.Expand(QueryExpression.Translate(Session.Factory, false), map);
 			var key = new StringBuilder(QueryExpression.Key);