Add timeouts support to MultiCriteria

Fixes #1403

Author: hazzik

src/NHibernate/Async/Impl/MultiCriteriaImpl.cs

@@ -151,7 +151,7 @@ private async Task GetResultsFromDatabaseAsync(IList results, CancellationToken
 
 			try
 			{
-				using (var reader = await (resultSetsCommand.GetReaderAsync(null, cancellationToken)).ConfigureAwait(false))
+				using (var reader = await (resultSetsCommand.GetReaderAsync(_timeout, cancellationToken)).ConfigureAwait(false))
 				{
 					var hydratedObjects = new List<object>[loaders.Count];
 					List<EntityKey[]>[] subselectResultKeys = new List<EntityKey[]>[loaders.Count];

src/NHibernate/Async/Impl/MultiQueryImpl.cs

@@ -84,7 +84,7 @@ protected async Task<List<object>> DoListAsync(CancellationToken cancellationTok
 
 			try
 			{
-				using (var reader = await (resultSetsCommand.GetReaderAsync(commandTimeout != RowSelection.NoValue ? commandTimeout : (int?)null, cancellationToken)).ConfigureAwait(false))
+				using (var reader = await (resultSetsCommand.GetReaderAsync(_timeout, cancellationToken)).ConfigureAwait(false))
 				{
 					if (log.IsDebugEnabled())
 					{

src/NHibernate/IMultiCriteria.cs

@@ -1,5 +1,7 @@
+using System;
 using System.Collections;
 using NHibernate.Criterion;
+using NHibernate.Impl;
 using NHibernate.Transform;
 
 namespace NHibernate
@@ -154,4 +156,26 @@ public partial interface IMultiCriteria
 		/// <returns></returns>
 		object GetResult(string key);
 	}
+
+	public static class MultiCriteriaExtensions
+	{
+		//6.0 TODO: Convert to interface method
+		/// <summary>
+		/// Set a timeout for the underlying ADO.NET query
+		/// </summary>
+		public static IMultiCriteria SetTimeout(this IMultiCriteria multiCriteria, int timeout)
+		{
+			if (multiCriteria == null)
+			{
+				throw new ArgumentNullException(nameof(multiCriteria));
+			}
+
+			if (multiCriteria is MultiCriteriaImpl impl)
+			{
+				return impl.SetTimeout(timeout);
+			}
+
+			throw new NotSupportedException(multiCriteria.GetType() + " does not support SetTimeout");
+		}
+	}
 }

src/NHibernate/Impl/MultiCriteriaImpl.cs

@@ -35,6 +35,7 @@ public partial class MultiCriteriaImpl : IMultiCriteria
 		private string cacheRegion;
 		private IResultTransformer resultTransformer;
 		private readonly IResultSetsCommand resultSetsCommand;
+		private int? _timeout;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="MultiCriteriaImpl"/> class.
@@ -221,7 +222,7 @@ private void GetResultsFromDatabase(IList results)
 
 			try
 			{
-				using (var reader = resultSetsCommand.GetReader(null))
+				using (var reader = resultSetsCommand.GetReader(_timeout))
 				{
 					var hydratedObjects = new List<object>[loaders.Count];
 					List<EntityKey[]>[] subselectResultKeys = new List<EntityKey[]>[loaders.Count];
@@ -474,5 +475,14 @@ private void ThrowIfKeyAlreadyExists(string key)
 			if (criteriaResultPositions.ContainsKey(key))
 				throw new InvalidOperationException(String.Format("The key '{0}' already exists", key));
 		}
+
+		/// <summary>
+		/// Set a timeout for the underlying ADO.NET query
+		/// </summary>
+		public IMultiCriteria SetTimeout(int timeout)
+		{
+			_timeout = timeout == RowSelection.NoValue ? (int?) null : timeout;
+			return this;
+		}
 	}
 }

src/NHibernate/Impl/MultiQueryImpl.cs

@@ -29,7 +29,7 @@ public partial class MultiQueryImpl : IMultiQuery
 		private IList queryResults;
 		private readonly Dictionary<string, int> queryResultPositions = new Dictionary<string, int>();
 		private string cacheRegion;
-		private int commandTimeout = RowSelection.NoValue;
+		private int? _timeout;
 		private bool isCacheable;
 		private readonly ISessionImplementor session;
 		private IResultTransformer resultTransformer;
@@ -64,7 +64,7 @@ public IMultiQuery SetForceCacheRefresh(bool cacheRefresh)
 
 		public IMultiQuery SetTimeout(int timeout)
 		{
-			commandTimeout = timeout;
+			_timeout = timeout == RowSelection.NoValue ? (int?) null : timeout;
 			return this;
 		}
 
@@ -526,7 +526,7 @@ protected List<object> DoList()
 
 			try
 			{
-				using (var reader = resultSetsCommand.GetReader(commandTimeout != RowSelection.NoValue ? commandTimeout : (int?)null))
+				using (var reader = resultSetsCommand.GetReader(_timeout))
 				{
 					if (log.IsDebugEnabled())
 					{