Fix NH-1913

SVN: trunk@4684

Author: Davy Brion

src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs

@@ -1,6 +1,7 @@
 using System.Data;
 using System.Text;
 using NHibernate.AdoNet.Util;
+using NHibernate.Util;
 
 namespace NHibernate.AdoNet
 {
@@ -21,13 +22,34 @@ public SqlClientBatchingBatcher(ConnectionManager connectionManager, IIntercepto
 		{
 			batchSize = Factory.Settings.AdoBatchSize;
 			currentBatch = new SqlClientSqlCommandSet();
+			SetCommandTimeout();
 			//we always create this, because we need to deal with a scenario in which
 			//the user change the logging configuration at runtime. Trying to put this
 			//behind an if(log.IsDebugEnabled) will cause a null reference exception 
 			//at that point.
 			currentBatchCommandsLog = new StringBuilder().AppendLine("Batch commands:");
 		}
 
+		private void SetCommandTimeout()
+		{
+			int timeout = PropertiesHelper.GetInt32(Cfg.Environment.CommandTimeout, Cfg.Environment.Properties, -1);
+
+			if (timeout > 0)
+			{
+				try
+				{
+					currentBatch.CommandTimeout = timeout;
+				}
+				catch (Exception e)
+				{
+					if (log.IsWarnEnabled)
+					{
+						log.Warn(e.ToString());
+					}
+				}
+			}
+		}
+
 		public override int BatchSize
 		{
 			get { return batchSize; }

src/NHibernate/AdoNet/SqlClientSqlCommandSet.cs

@@ -18,6 +18,7 @@ public class SqlClientSqlCommandSet : IDisposable
 		private object instance;
 		private PropSetter<SqlConnection> connectionSetter;
 		private PropSetter<SqlTransaction> transactionSetter;
+		private PropSetter<int> commandTimeoutSetter;
 		private PropGetter<SqlConnection> connectionGetter;
 		private SqlClientSqlCommandSet.PropGetter<System.Data.SqlClient.SqlCommand> commandGetter;
 		private AppendCommand doAppend;
@@ -41,6 +42,9 @@ public SqlClientSqlCommandSet()
 			transactionSetter = (PropSetter<SqlTransaction>)
 			                    Delegate.CreateDelegate(typeof(PropSetter<SqlTransaction>),
 			                                            instance, "set_Transaction");
+			commandTimeoutSetter = (PropSetter<int>)
+								Delegate.CreateDelegate(typeof(PropSetter<int>),
+														instance, "set_CommandTimeout");
 			connectionGetter = (PropGetter<SqlConnection>)
 			                   Delegate.CreateDelegate(typeof(PropGetter<SqlConnection>),
 			                                           instance, "get_Connection");
@@ -130,6 +134,11 @@ public SqlTransaction Transaction
 			set { transactionSetter(value); }
 		}
 
+		public int CommandTimeout
+		{
+			set { commandTimeoutSetter(value); }
+		}
+
 		///<summary>
 		///Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
 		///</summary>