One more time

Author: hazzik

src/NHibernate/Transaction/AdoNetWithDistributedTransactionFactory.cs

@@ -32,12 +32,14 @@ public void EnlistInDistributedTransactionIfNeeded(ISessionImplementor session)
 			if (transaction == null)
 				return;
 
-			session.TransactionContext = new DistributedTransactionContext();
+			var notification = new PrepareTransactionNotification(session, transaction);
 
 			transaction.EnlistVolatile(
-				new PrepareTransactionNotification(session, transaction),
+				notification,
 				EnlistmentOptions.EnlistDuringPrepareRequired);
 
+			session.TransactionContext = notification;
+
 			transaction.EnlistVolatile(
 				new TransactionCompletionNotification(session),
 				EnlistmentOptions.None);
@@ -62,16 +64,7 @@ public void ExecuteWorkInIsolation(ISessionImplementor session, IIsolatedWork wo
 			}
 		}
 
-		class DistributedTransactionContext : ITransactionContext
-		{
-			public bool ShouldCloseSessionOnDistributedTransactionCompleted { get; set; }
-
-			public void Dispose()
-			{
-			}
-		}
-
-		class PrepareTransactionNotification : IEnlistmentNotification
+		class PrepareTransactionNotification : IEnlistmentNotification, ITransactionContext
 		{
 			System.Transactions.Transaction _transaction;
 
@@ -83,11 +76,12 @@ public PrepareTransactionNotification(ISessionImplementor session, System.Transa
 				_transaction = transaction.Clone();
 			}
 
+			public bool ShouldCloseSessionOnDistributedTransactionCompleted { get; set; }
+
 			void IEnlistmentNotification.Prepare(PreparingEnlistment preparingEnlistment)
 			{
 				using (new SessionIdLoggingContext(_session.SessionId))
 				{
-
 					try
 					{
 						using (var tx = new TransactionScope(_transaction))
@@ -143,6 +137,16 @@ 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