Dispose transaction at the end of the TransactionScope life-cycle.

Author: hazzik

src/NHibernate/Transaction/AdoNetWithDistributedTransactionFactory.cs

@@ -40,10 +40,6 @@ public void EnlistInDistributedTransactionIfNeeded(ISessionImplementor session)
 
 			session.TransactionContext = notification;
 
-			transaction.EnlistVolatile(
-				new TransactionCompletionNotification(session),
-				EnlistmentOptions.None);
-
 			logger.DebugFormat("enlisted into DTC transaction: {0}", transaction.IsolationLevel.ToString());
 			session.AfterTransactionBegin(null);
 		}
@@ -108,63 +104,12 @@ void IEnlistmentNotification.Prepare(PreparingEnlistment preparingEnlistment)
 					{
 						preparingEnlistment.ForceRollback(exception);
 					}
-					finally
-					{
-						_session = null;
-						try
-						{
-							if (_transaction != null) _transaction.Dispose();
-						}
-						finally
-						{
-							_transaction = null;
-						}
-					}
 				}
 			}
 
 			void IEnlistmentNotification.Commit(Enlistment enlistment)
 			{
-				enlistment.Done();
-			}
-
-			void IEnlistmentNotification.Rollback(Enlistment enlistment)
-			{
-				enlistment.Done();
-			}
-
-			void IEnlistmentNotification.InDoubt(Enlistment enlistment)
-			{
-				enlistment.Done();
-			}
-
-			public void Dispose()
-			{
-				if (!ReferenceEquals(_transaction, null))
-					_transaction.Dispose();
-				_transaction = null;
-				if (!ReferenceEquals(_session, null))
-					_session.TransactionContext = null;
-				_session = null;
-			}
-		}
-
-		class TransactionCompletionNotification : IEnlistmentNotification
-		{
-			ISessionImplementor _session;
-
-			public TransactionCompletionNotification(ISessionImplementor session)
-			{
-				_session = session;
-			}
-
-			void IEnlistmentNotification.Prepare(PreparingEnlistment preparingEnlistment)
-			{
-				preparingEnlistment.Prepared();
-			}
-
-			void IEnlistmentNotification.Commit(Enlistment enlistment)
-			{
+				using (this)
 				using (new SessionIdLoggingContext(_session.SessionId))
 				{
 					try
@@ -178,14 +123,14 @@ void IEnlistmentNotification.Commit(Enlistment enlistment)
 					}
 					finally
 					{
-						_session = null;
 						enlistment.Done();
 					}
 				}
 			}
 
 			void IEnlistmentNotification.Rollback(Enlistment enlistment)
 			{
+				using (this)
 				using (new SessionIdLoggingContext(_session.SessionId))
 				{
 					try
@@ -199,14 +144,14 @@ void IEnlistmentNotification.Rollback(Enlistment enlistment)
 					}
 					finally
 					{
-						_session = null;
 						enlistment.Done();
 					}
 				}
 			}
 
 			void IEnlistmentNotification.InDoubt(Enlistment enlistment)
 			{
+				using (this)
 				using (new SessionIdLoggingContext(_session.SessionId))
 				{
 					try
@@ -220,12 +165,21 @@ void IEnlistmentNotification.InDoubt(Enlistment enlistment)
 					}
 					finally
 					{
-						_session = null;
 						enlistment.Done();
 					}
 				}
 			}
 
+			public void Dispose()
+			{
+				if (!ReferenceEquals(_transaction, null))
+					_transaction.Dispose();
+				_transaction = null;
+				if (!ReferenceEquals(_session, null))
+					_session.TransactionContext = null;
+				_session = null;
+			}
+
 			void OnTransactionCompleted(bool successful)
 			{
 				var transactionContext = _session.TransactionContext;