Mark Environment.InterceptorsBeforeTransactionCompletionIgnoreExceptions and related as obsolete. The configurability is only there for backwards compatibility. Longterm, this complexity is unwarranted.

Author: oskarb

src/NHibernate.Test/NHSpecificTest/NH1082/Fixture.cs

@@ -1,6 +1,7 @@
-using System.Collections;
+using System;
 using NHibernate.Cfg;
 using NUnit.Framework;
+using Environment = NHibernate.Cfg.Environment;
 
 namespace NHibernate.Test.NHSpecificTest.NH1082
 {
@@ -15,7 +16,9 @@ public override string BugNumber
 		[Test]
 		public void ExceptionsInBeforeTransactionCompletionAbortTransaction()
 		{
+#pragma warning disable 618
 			Assert.IsFalse(sessions.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled);
+#pragma warning restore 618
 
 			var c = new C {ID = 1, Value = "value"};
 
@@ -39,7 +42,9 @@ public void ExceptionsInBeforeTransactionCompletionAbortTransaction()
 		[Test]
 		public void ExceptionsInSynchronizationBeforeTransactionCompletionAbortTransaction()
 		{
+#pragma warning disable 618
 			Assert.IsFalse(sessions.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled);
+#pragma warning restore 618
 
 			var c = new C { ID = 1, Value = "value" };
 
@@ -64,6 +69,7 @@ public void ExceptionsInSynchronizationBeforeTransactionCompletionAbortTransacti
 
 
 	[TestFixture]
+	[Obsolete("Can be removed when Environment.InterceptorsBeforeTransactionCompletionIgnoreExceptions is removed.")]
 	public class OldBehaviorEnabledFixture : BugTestCase
 	{
 		public override string BugNumber

src/NHibernate/Cfg/Environment.cs

@@ -176,6 +176,7 @@ public static string Version
 		/// If this setting is set to true, exceptions in IInterceptor.BeforeTransactionCompletion are ignored and the commit is performed.
 		/// The default setting is false.
 		/// </summary>
+		[Obsolete("This setting is likely to be removed in a future version of NHibernate. The workaround is to catch all exceptions in the IInterceptor implementation.")]
 		public const string InterceptorsBeforeTransactionCompletionIgnoreExceptions = "interceptors.beforetransactioncompletion_ignore_exceptions";
 
 		private static readonly Dictionary<string, string> GlobalProperties;

src/NHibernate/Cfg/Settings.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Data;
 using NHibernate.AdoNet;
@@ -125,6 +126,7 @@ public Settings()
 		/// </summary>
 		public ILinqToHqlGeneratorsRegistry LinqToHqlGeneratorsRegistry { get; internal set; }
 
+		[Obsolete("This setting is likely to be removed in a future version of NHibernate. The workaround is to catch all exceptions in the IInterceptor implementation.")]
 		public bool IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled { get; internal set; }
 
 		#endregion

src/NHibernate/Cfg/SettingsFactory.cs

@@ -265,10 +265,12 @@ public Settings BuildSettings(IDictionary<string, string> properties)
 			log.Info("Named query checking : " + EnabledDisabled(namedQueryChecking));
 			settings.IsNamedQueryStartupCheckingEnabled = namedQueryChecking;
 
-			var interceptorsBeforeTransactionCompletionIgnoreExceptions = PropertiesHelper.GetBoolean(Environment.InterceptorsBeforeTransactionCompletionIgnoreExceptions, properties, false);
+#pragma warning disable 618 // Disable warning for use of obsolete symbols.
+			var interceptorsBeforeTransactionCompletionIgnoreExceptions = PropertiesHelper.GetBoolean(Environment.InterceptorsBeforeTransactionCompletionIgnoreExceptions, properties, false);
 			log.Info("Ignoring exceptions in BeforeTransactionCompletion : " + EnabledDisabled(interceptorsBeforeTransactionCompletionIgnoreExceptions));
-			settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled = interceptorsBeforeTransactionCompletionIgnoreExceptions;
- 
+			settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled = interceptorsBeforeTransactionCompletionIgnoreExceptions;
+#pragma warning restore 618
+			
 			// Not ported - settings.StatementFetchSize = statementFetchSize;
 			// Not ported - ScrollableResultSetsEnabled
 			// Not ported - GetGeneratedKeysEnabled

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -490,10 +490,14 @@ public ISession OpenSession(IInterceptor sessionLocalInterceptor)
 		public ISession OpenSession(IDbConnection connection, bool flushBeforeCompletionEnabled, bool autoCloseSessionEnabled,
 									ConnectionReleaseMode connectionReleaseMode)
 		{
+#pragma warning disable 618
+			var isInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled = settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled;
+#pragma warning restore 618
+
 			return
 				new SessionImpl(connection, this, true, settings.CacheProvider.NextTimestamp(), interceptor,
 								settings.DefaultEntityMode, flushBeforeCompletionEnabled, autoCloseSessionEnabled,
-								settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled, connectionReleaseMode);
+								isInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled, connectionReleaseMode);
 		}
 
 		public IEntityPersister GetEntityPersister(string entityName)
@@ -1204,9 +1208,13 @@ private IDictionary<string, HibernateException> CheckNamedQueries()
 
 		private SessionImpl OpenSession(IDbConnection connection, bool autoClose, long timestamp, IInterceptor sessionLocalInterceptor)
 		{
+#pragma warning disable 618
+			var isInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled = settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled;
+#pragma warning restore 618
+
 			SessionImpl session = new SessionImpl(connection, this, autoClose, timestamp, sessionLocalInterceptor ?? interceptor,
 												  settings.DefaultEntityMode, settings.IsFlushBeforeCompletionEnabled,
-												  settings.IsAutoCloseSessionEnabled, settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled,
+												  settings.IsAutoCloseSessionEnabled, isInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled,
 												  settings.ConnectionReleaseMode);
 			if (sessionLocalInterceptor != null)
 			{

src/NHibernate/Transaction/AdoTransaction.cs

@@ -425,8 +425,10 @@ private void NotifyLocalSynchsBeforeTransactionCompletion()
 					catch (Exception e)
 					{
 						log.Error("exception calling user Synchronization", e);
+#pragma warning disable 618
 						if (!session.Factory.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled)
 							throw;
+#pragma warning restore 618
 					}
 				}
 			}