Clean up a bit isolation work code

Author: fredericDelaporte

src/NHibernate/Async/Transaction/AdoNetTransactionFactory.cs

@@ -41,7 +41,6 @@ async Task InternalExecuteWorkInIsolationAsync()
 			{
 
 				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
@@ -53,20 +52,13 @@ async Task InternalExecuteWorkInIsolationAsync()
 					if (transacted)
 					{
 						trans = connection.BeginTransaction();
-						// TODO NH: a way to read the autocommit state is needed
-						//if (TransactionManager.GetAutoCommit(connection))
-						//{
-						//  wasAutoCommit = true;
-						//  TransactionManager.SetAutoCommit(connection, false);
-						//}
 					}
 
 					await (work.DoWorkAsync(connection, trans, cancellationToken)).ConfigureAwait(false);
 
 					if (transacted)
 					{
 						trans.Commit();
-						//TransactionManager.Commit(connection);
 					}
 				}
 				catch (Exception t)
@@ -85,36 +77,20 @@ async Task InternalExecuteWorkInIsolationAsync()
 							isolaterLog.Debug(ignore, "Unable to rollback transaction");
 						}
 
-						if (t is HibernateException)
-						{
-							throw;
-						}
-						else if (t is DbException)
-						{
-							throw ADOExceptionHelper.Convert(session.Factory.SQLExceptionConverter, t,
-						                                 "error performing isolated work");
-						}
-						else
-						{
-							throw new HibernateException("error performing isolated work", t);
-						}
+						switch (t)
+					{
+						case HibernateException _:
+								throw;
+						case DbException _:
+								throw ADOExceptionHelper.Convert(session.Factory.SQLExceptionConverter, t,
+							                                 "error performing isolated work");
+						default:
+								throw new HibernateException("error performing isolated work", t);
+					}
 					}
 				}
 				finally
 				{
-					//if (transacted && wasAutoCommit)
-					//{
-					//  try
-					//  {
-					//    // TODO NH: reset autocommit
-					//    // TransactionManager.SetAutoCommit(connection, true);
-					//  }
-					//  catch (Exception)
-					//  {
-					//    log.Debug("was unable to reset connection back to auto-commit");
-					//  }
-					//}
-
 					try
 					{
 						trans?.Dispose();

src/NHibernate/Transaction/AdoNetTransactionFactory.cs

@@ -51,7 +51,6 @@ public virtual void ExecuteWorkInIsolation(ISessionImplementor session, IIsolate
 				throw new ArgumentNullException(nameof(work));
 
 			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
@@ -63,20 +62,13 @@ public virtual void ExecuteWorkInIsolation(ISessionImplementor session, IIsolate
 				if (transacted)
 				{
 					trans = connection.BeginTransaction();
-					// TODO NH: a way to read the autocommit state is needed
-					//if (TransactionManager.GetAutoCommit(connection))
-					//{
-					//  wasAutoCommit = true;
-					//  TransactionManager.SetAutoCommit(connection, false);
-					//}
 				}
 
 				work.DoWork(connection, trans);
 
 				if (transacted)
 				{
 					trans.Commit();
-					//TransactionManager.Commit(connection);
 				}
 			}
 			catch (Exception t)
@@ -95,36 +87,20 @@ public virtual void ExecuteWorkInIsolation(ISessionImplementor session, IIsolate
 						isolaterLog.Debug(ignore, "Unable to rollback transaction");
 					}
 
-					if (t is HibernateException)
+					switch (t)
 					{
-						throw;
-					}
-					else if (t is DbException)
-					{
-						throw ADOExceptionHelper.Convert(session.Factory.SQLExceptionConverter, t,
-						                                 "error performing isolated work");
-					}
-					else
-					{
-						throw new HibernateException("error performing isolated work", t);
+						case HibernateException _:
+							throw;
+						case DbException _:
+							throw ADOExceptionHelper.Convert(session.Factory.SQLExceptionConverter, t,
+							                                 "error performing isolated work");
+						default:
+							throw new HibernateException("error performing isolated work", t);
 					}
 				}
 			}
 			finally
 			{
-				//if (transacted && wasAutoCommit)
-				//{
-				//  try
-				//  {
-				//    // TODO NH: reset autocommit
-				//    // TransactionManager.SetAutoCommit(connection, true);
-				//  }
-				//  catch (Exception)
-				//  {
-				//    log.Debug("was unable to reset connection back to auto-commit");
-				//  }
-				//}
-
 				try
 				{
 					trans?.Dispose();