Fix transaction leak

src/NHibernate.Test/Ado/BatcherFixture.cs

@@ -1,4 +1,3 @@
-using System.Collections;
 using NHibernate.AdoNet;
 using NHibernate.Cfg;
 using NUnit.Framework;
@@ -44,11 +43,11 @@ public void OneRoundTripInserts()
 		private void Cleanup()
 		{
 			using (ISession s = Sfi.OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				s.CreateQuery("delete from VerySimple").ExecuteUpdate();
 				s.CreateQuery("delete from AlmostSimple").ExecuteUpdate();
-				s.Transaction.Commit();
+				t.Commit();
 			}
 		}
 

src/NHibernate.Test/Ado/GenericBatchingBatcherFixture.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Diagnostics;
 using System.Linq;
 using NHibernate.AdoNet;
@@ -229,10 +228,10 @@ private void DbShoudBeEmpty()
 		private void Cleanup()
 		{
 			using (var s = Sfi.OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				s.CreateQuery("delete from VerySimple").ExecuteUpdate();
-				s.Transaction.Commit();
+				t.Commit();
 			}
 		}
 

src/NHibernate.Test/Any/AnyTypeTest.cs

@@ -1,4 +1,3 @@
-using System.Collections;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Any
@@ -24,30 +23,36 @@ protected override string CacheConcurrencyStrategy
 		[Test]
 		public void FlushProcessing()
 		{
+			var person = new Person();
+			var address = new Address();
 			//http://opensource.atlassian.com/projects/hibernate/browse/HHH-1663
-			ISession session = OpenSession();
-			session.BeginTransaction();
-			Person person = new Person();
-			Address address = new Address();
-			person.Data = address;
-			session.SaveOrUpdate(person);
-			session.SaveOrUpdate(address);
-			session.Transaction.Commit();
-			session.Close();
+			using (var session = OpenSession())
+			using (var tran = session.BeginTransaction())
+			{
+				person.Data = address;
+				session.SaveOrUpdate(person);
+				session.SaveOrUpdate(address);
+				tran.Commit();
+				session.Close();
+			}
 
-			session = OpenSession();
-			session.BeginTransaction();
-			person = (Person) session.Load(typeof (Person), person.Id);
-			person.Name = "makingpersondirty";
-			session.Transaction.Commit();
-			session.Close();
+			using (var session = OpenSession())
+			using (var tran = session.BeginTransaction())
+			{
+				person = (Person) session.Load(typeof(Person), person.Id);
+				person.Name = "makingpersondirty";
+				tran.Commit();
+				session.Close();
+			}
 
-			session = OpenSession();
-			session.BeginTransaction();
-			session.Delete(person);
-			session.Delete(address);
-			session.Transaction.Commit();
-			session.Close();
+			using (var session = OpenSession())
+			using (var tran = session.BeginTransaction())
+			{
+				session.Delete(person);
+				session.Delete(address);
+				tran.Commit();
+				session.Close();
+			}
 		}
 	}
-}
+}

src/NHibernate.Test/Async/Ado/BatcherFixture.cs

@@ -8,7 +8,6 @@
 //------------------------------------------------------------------------------
 
 
-using System.Collections;
 using NHibernate.AdoNet;
 using NHibernate.Cfg;
 using NUnit.Framework;
@@ -56,11 +55,11 @@ public async Task OneRoundTripInsertsAsync()
 		private async Task CleanupAsync(CancellationToken cancellationToken = default(CancellationToken))
 		{
 			using (ISession s = Sfi.OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				await (s.CreateQuery("delete from VerySimple").ExecuteUpdateAsync(cancellationToken));
 				await (s.CreateQuery("delete from AlmostSimple").ExecuteUpdateAsync(cancellationToken));
-				await (s.Transaction.CommitAsync(cancellationToken));
+				await (t.CommitAsync(cancellationToken));
 			}
 		}
 

src/NHibernate.Test/Async/Ado/GenericBatchingBatcherFixture.cs

@@ -9,7 +9,6 @@
 
 
 using System;
-using System.Collections;
 using System.Diagnostics;
 using System.Linq;
 using NHibernate.AdoNet;
@@ -241,10 +240,10 @@ public override SqlString OnPrepareStatement(SqlString sql)
 		private async Task CleanupAsync(CancellationToken cancellationToken = default(CancellationToken))
 		{
 			using (var s = Sfi.OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				await (s.CreateQuery("delete from VerySimple").ExecuteUpdateAsync(cancellationToken));
-				await (s.Transaction.CommitAsync(cancellationToken));
+				await (t.CommitAsync(cancellationToken));
 			}
 		}
 

src/NHibernate.Test/Async/Any/AnyTypeTest.cs

@@ -8,7 +8,6 @@
 //------------------------------------------------------------------------------
 
 
-using System.Collections;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Any
@@ -35,30 +34,36 @@ protected override string CacheConcurrencyStrategy
 		[Test]
 		public async Task FlushProcessingAsync()
 		{
+			var person = new Person();
+			var address = new Address();
 			//http://opensource.atlassian.com/projects/hibernate/browse/HHH-1663
-			ISession session = OpenSession();
-			session.BeginTransaction();
-			Person person = new Person();
-			Address address = new Address();
-			person.Data = address;
-			await (session.SaveOrUpdateAsync(person));
-			await (session.SaveOrUpdateAsync(address));
-			await (session.Transaction.CommitAsync());
-			session.Close();
+			using (var session = OpenSession())
+			using (var tran = session.BeginTransaction())
+			{
+				person.Data = address;
+				await (session.SaveOrUpdateAsync(person));
+				await (session.SaveOrUpdateAsync(address));
+				await (tran.CommitAsync());
+				session.Close();
+			}
 
-			session = OpenSession();
-			session.BeginTransaction();
-			person = (Person) await (session.LoadAsync(typeof (Person), person.Id));
-			person.Name = "makingpersondirty";
-			await (session.Transaction.CommitAsync());
-			session.Close();
+			using (var session = OpenSession())
+			using (var tran = session.BeginTransaction())
+			{
+				person = (Person) await (session.LoadAsync(typeof(Person), person.Id));
+				person.Name = "makingpersondirty";
+				await (tran.CommitAsync());
+				session.Close();
+			}
 
-			session = OpenSession();
-			session.BeginTransaction();
-			await (session.DeleteAsync(person));
-			await (session.DeleteAsync(address));
-			await (session.Transaction.CommitAsync());
-			session.Close();
+			using (var session = OpenSession())
+			using (var tran = session.BeginTransaction())
+			{
+				await (session.DeleteAsync(person));
+				await (session.DeleteAsync(address));
+				await (tran.CommitAsync());
+				session.Close();
+			}
 		}
 	}
-}
+}

src/NHibernate.Test/Async/Cascade/Circle/MultiPathCircleCascadeTest.cs

@@ -166,21 +166,21 @@ public async Task MergeRouteAsync()
 			ClearCounts();
 
 			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				await (s.MergeAsync(route));
-				await (s.Transaction.CommitAsync());
+				await (t.CommitAsync());
 			}
 
 			AssertInsertCount(4);
 			AssertUpdateCount(1);
 
 			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				route = await (s.GetAsync<Route>(route.RouteId));
 				CheckResults(route, true);
-				await (s.Transaction.CommitAsync());
+				await (t.CommitAsync());
 			}
 		}
 
@@ -192,23 +192,23 @@ public async Task MergePickupNodeAsync()
 			ClearCounts();
 
 			using (var s = OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				Node pickupNode = route.Nodes.First(n => n.Name == "pickupNodeB");
 				pickupNode = (Node) await (s.MergeAsync(pickupNode));
 
-				await (s.Transaction.CommitAsync());
+				await (t.CommitAsync());
 			}
 
 			AssertInsertCount(4);
 			AssertUpdateCount(0);
 
 			using (var s = OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				route = await (s.GetAsync<Route>(route.RouteId));
 				CheckResults(route, false);
-				await (s.Transaction.CommitAsync());
+				await (t.CommitAsync());
 			}
 		}
 
@@ -220,22 +220,22 @@ public async Task MergeDeliveryNodeAsync()
 			ClearCounts();
 
 			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				Node deliveryNode = route.Nodes.First(n => n.Name == "deliveryNodeB");
 				deliveryNode = (Node) await (s.MergeAsync(deliveryNode));
-				await (s.Transaction.CommitAsync());
+				await (t.CommitAsync());
 			}
 
 			AssertInsertCount(4);
 			AssertUpdateCount(0);
 
 			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				route = await (s.GetAsync<Route>(route.RouteId));
 				CheckResults(route, false);
-				await (s.Transaction.CommitAsync());
+				await (t.CommitAsync());
 			}
 		}
 
@@ -247,21 +247,21 @@ public async Task MergeTourAsync()
 			ClearCounts();
 
 			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				Tour tour = await (s.MergeAsync(route.Nodes.First().Tour));
-				await (s.Transaction.CommitAsync());
+				await (t.CommitAsync());
 			}
 
 			AssertInsertCount(4);
 			AssertUpdateCount(0);
 
 			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				route = await (s.GetAsync<Route>(route.RouteId));
 				CheckResults(route, false);
-				await (s.Transaction.CommitAsync());
+				await (t.CommitAsync());
 			}
 		}
 
@@ -273,7 +273,7 @@ public async Task MergeTransportAsync()
 			ClearCounts();
 
 			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				Node node = route.Nodes.First();
 				Transport transport = null;
@@ -285,31 +285,31 @@ public async Task MergeTransportAsync()
 
 				transport = (Transport) await (s.MergeAsync(transport));
 
-				await (s.Transaction.CommitAsync());
+				await (t.CommitAsync());
 			}
 
 			AssertInsertCount(4);
 			AssertUpdateCount(0);
 
 			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				route = await (s.GetAsync<Route>(route.RouteId));
 				CheckResults(route, false);
-				await (s.Transaction.CommitAsync());
+				await (t.CommitAsync());
 			}
 		}
 
 		private async Task<Route> GetUpdatedDetachedEntityAsync(CancellationToken cancellationToken = default(CancellationToken))
 		{
 			Route route = new Route();
 			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
+			using (var t = s.BeginTransaction())
 			{
 				route.Name = "routeA";
 
 				await (s.SaveAsync(route, cancellationToken));
-				await (s.Transaction.CommitAsync(cancellationToken));
+				await (t.CommitAsync(cancellationToken));
 			}
 			route.Name = "new routeA";
 			route.TransientField = "sfnaouisrbn";