fixup! Fix some NRE in work isolation and connection handling

fredericDelaporte · fredericDelaporte · commit 5ea4fc60cbb6 · 2020-03-22T19:31:07.000+01:00
diff --git a/src/NHibernate/Async/Transaction/AdoNetTransactionFactory.cs b/src/NHibernate/Async/Transaction/AdoNetTransactionFactory.cs
@@ -40,17 +40,15 @@ public virtual Task ExecuteWorkInIsolationAsync(ISessionImplementor session, IIs
 			async Task InternalExecuteWorkInIsolationAsync()
 			{
 
-				DbConnection connection = null;
 				DbTransaction trans = null;
 				// bool wasAutoCommit = false;
+				// We make an exception for SQLite and use the session's connection,
+				// since SQLite only allows one connection to the database.
+				var connection = session.Factory.Dialect is SQLiteDialect
+				? session.Connection
+				: await (session.Factory.ConnectionProvider.GetConnectionAsync(cancellationToken)).ConfigureAwait(false);
 				try
 				{
-					// We make an exception for SQLite and use the session's connection,
-					// since SQLite only allows one connection to the database.
-					if (session.Factory.Dialect is SQLiteDialect)
-						connection = session.Connection;
-					else
-						connection = await (session.Factory.ConnectionProvider.GetConnectionAsync(cancellationToken)).ConfigureAwait(false);
 
 					if (transacted)
 					{
@@ -126,7 +124,7 @@ async Task InternalExecuteWorkInIsolationAsync()
 						isolaterLog.Warn(ignore, "Unable to dispose transaction");
 					}
 
-					if (connection != null && session.Factory.Dialect is SQLiteDialect == false)
+					if (session.Factory.Dialect is SQLiteDialect == false)
 						session.Factory.ConnectionProvider.CloseConnection(connection);
 				}
 			}
diff --git a/src/NHibernate/Transaction/AdoNetTransactionFactory.cs b/src/NHibernate/Transaction/AdoNetTransactionFactory.cs
@@ -50,17 +50,15 @@ public virtual void ExecuteWorkInIsolation(ISessionImplementor session, IIsolate
 			if (work == null)
 				throw new ArgumentNullException(nameof(work));
 
-			DbConnection connection = null;
 			DbTransaction trans = null;
 			// bool wasAutoCommit = false;
+			// We make an exception for SQLite and use the session's connection,
+			// since SQLite only allows one connection to the database.
+			var connection = session.Factory.Dialect is SQLiteDialect
+				? session.Connection
+				: session.Factory.ConnectionProvider.GetConnection();
 			try
 			{
-				// We make an exception for SQLite and use the session's connection,
-				// since SQLite only allows one connection to the database.
-				if (session.Factory.Dialect is SQLiteDialect)
-					connection = session.Connection;
-				else
-					connection = session.Factory.ConnectionProvider.GetConnection();
 
 				if (transacted)
 				{
@@ -136,7 +134,7 @@ public virtual void ExecuteWorkInIsolation(ISessionImplementor session, IIsolate
 					isolaterLog.Warn(ignore, "Unable to dispose transaction");
 				}
 
-				if (connection != null && session.Factory.Dialect is SQLiteDialect == false)
+				if (session.Factory.Dialect is SQLiteDialect == false)
 					session.Factory.ConnectionProvider.CloseConnection(connection);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -40,17 +40,15 @@ public virtual Task ExecuteWorkInIsolationAsync(ISessionImplementor session, IIs`
`40`	`40`	`async Task InternalExecuteWorkInIsolationAsync()`
`41`	`41`	`{`
`42`	`42`
`43`		`- DbConnection connection = null;`
`44`	`43`	`DbTransaction trans = null;`
`45`	`44`	`// bool wasAutoCommit = false;`
	`45`	`+ // We make an exception for SQLite and use the session's connection,`
	`46`	`+ // since SQLite only allows one connection to the database.`
	`47`	`+ var connection = session.Factory.Dialect is SQLiteDialect`
	`48`	`+ ? session.Connection`
	`49`	`+ : await (session.Factory.ConnectionProvider.GetConnectionAsync(cancellationToken)).ConfigureAwait(false);`
`46`	`50`	`try`
`47`	`51`	`{`
`48`		`- // We make an exception for SQLite and use the session's connection,`
`49`		`- // since SQLite only allows one connection to the database.`
`50`		`- if (session.Factory.Dialect is SQLiteDialect)`
`51`		`- connection = session.Connection;`
`52`		`- else`
`53`		`- connection = await (session.Factory.ConnectionProvider.GetConnectionAsync(cancellationToken)).ConfigureAwait(false);`
`54`	`52`
`55`	`53`	`if (transacted)`
`56`	`54`	`{`
`@@ -126,7 +124,7 @@ async Task InternalExecuteWorkInIsolationAsync()`
`126`	`124`	`isolaterLog.Warn(ignore, "Unable to dispose transaction");`
`127`	`125`	`}`
`128`	`126`
`129`		`- if (connection != null && session.Factory.Dialect is SQLiteDialect == false)`
	`127`	`+ if (session.Factory.Dialect is SQLiteDialect == false)`
`130`	`128`	`session.Factory.ConnectionProvider.CloseConnection(connection);`
`131`	`129`	`}`
`132`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,17 +50,15 @@ public virtual void ExecuteWorkInIsolation(ISessionImplementor session, IIsolate`
`50`	`50`	`if (work == null)`
`51`	`51`	`throw new ArgumentNullException(nameof(work));`
`52`	`52`
`53`		`- DbConnection connection = null;`
`54`	`53`	`DbTransaction trans = null;`
`55`	`54`	`// bool wasAutoCommit = false;`
	`55`	`+ // We make an exception for SQLite and use the session's connection,`
	`56`	`+ // since SQLite only allows one connection to the database.`
	`57`	`+ var connection = session.Factory.Dialect is SQLiteDialect`
	`58`	`+ ? session.Connection`
	`59`	`+ : session.Factory.ConnectionProvider.GetConnection();`
`56`	`60`	`try`
`57`	`61`	`{`
`58`		`- // We make an exception for SQLite and use the session's connection,`
`59`		`- // since SQLite only allows one connection to the database.`
`60`		`- if (session.Factory.Dialect is SQLiteDialect)`
`61`		`- connection = session.Connection;`
`62`		`- else`
`63`		`- connection = session.Factory.ConnectionProvider.GetConnection();`
`64`	`62`
`65`	`63`	`if (transacted)`
`66`	`64`	`{`
`@@ -136,7 +134,7 @@ public virtual void ExecuteWorkInIsolation(ISessionImplementor session, IIsolate`
`136`	`134`	`isolaterLog.Warn(ignore, "Unable to dispose transaction");`
`137`	`135`	`}`
`138`	`136`
`139`		`- if (connection != null && session.Factory.Dialect is SQLiteDialect == false)`
	`137`	`+ if (session.Factory.Dialect is SQLiteDialect == false)`
`140`	`138`	`session.Factory.ConnectionProvider.CloseConnection(connection);`
`141`	`139`	`}`
`142`	`140`	`}`