Do not call GC.SuppressFinalize from finalizer thread

Author: bahusoid

src/NHibernate/AdoNet/AbstractBatcher.cs

@@ -616,13 +616,13 @@ protected virtual void Dispose(bool isDisposing)
 			if (isDisposing)
 			{
 				CloseCommands();
+				// nothing for Finalizer to do - so tell the GC to ignore it
+				GC.SuppressFinalize(this);
 			}
 
 			// free unmanaged resources here
 
 			_isAlreadyDisposed = true;
-			// nothing for Finalizer to do - so tell the GC to ignore it
-			GC.SuppressFinalize(this);
 		}
 
 		#endregion

src/NHibernate/Async/Transaction/AdoTransaction.cs

@@ -181,13 +181,13 @@ protected virtual async Task DisposeAsync(bool isDisposing, CancellationToken ca
 						// Assume we are rolled back
 						await (AfterTransactionCompletionAsync(false, cancellationToken)).ConfigureAwait(false);
 					}
+					// nothing for Finalizer to do - so tell the GC to ignore it
+					GC.SuppressFinalize(this);
 				}
 
 				// free unmanaged resources here
 
 				_isAlreadyDisposed = true;
-				// nothing for Finalizer to do - so tell the GC to ignore it
-				GC.SuppressFinalize(this);
 			}
 		}
 

src/NHibernate/Connection/ConnectionProvider.cs

@@ -198,13 +198,13 @@ protected virtual void Dispose(bool isDisposing)
 			if (isDisposing)
 			{
 				log.Debug("Disposing of ConnectionProvider.");
+				// nothing for Finalizer to do - so tell the GC to ignore it
+				GC.SuppressFinalize(this);
 			}
 
 			// free unmanaged resources here
 
 			_isAlreadyDisposed = true;
-			// nothing for Finalizer to do - so tell the GC to ignore it
-			GC.SuppressFinalize(this);
 		}
 
 		#endregion

src/NHibernate/Impl/EnumerableImpl.cs

@@ -310,13 +310,13 @@ protected virtual void Dispose(bool isDisposing)
 					_currentResult = null;
 					_session.Batcher.CloseCommand(_cmd, _reader);
 				}
+				// nothing for Finalizer to do - so tell the GC to ignore it
+				GC.SuppressFinalize(this);
 			}
 
 			// free unmanaged resources here
 
 			_isAlreadyDisposed = true;
-			// nothing for Finalizer to do - so tell the GC to ignore it
-			GC.SuppressFinalize(this);
 		}
 
 		#endregion

src/NHibernate/Impl/SessionImpl.cs

@@ -1543,17 +1543,18 @@ private void Dispose(bool isDisposing)
 
 				// free managed resources that are being managed by the session if we
 				// know this call came through Dispose()
-				if (isDisposing && !IsClosed)
+				if (isDisposing)
 				{
-					Close();
+					if (!IsClosed)
+					{
+						Close();
+					}
+					// nothing for Finalizer to do - so tell the GC to ignore it
+					GC.SuppressFinalize(this);
 				}
 
 				// free unmanaged resources here
-
 				IsAlreadyDisposed = true;
-
-				// nothing for Finalizer to do - so tell the GC to ignore it
-				GC.SuppressFinalize(this);
 			}
 		}
 

src/NHibernate/Impl/StatelessSessionImpl.cs

@@ -812,16 +812,19 @@ protected void Dispose(bool isDisposing)
 
 				// free managed resources that are being managed by the session if we
 				// know this call came through Dispose()
-				if (isDisposing && !IsClosed)
+				if (isDisposing)
 				{
-					Close();
+					if (!IsClosed)
+					{
+						Close();
+					}
+
+					// nothing for Finalizer to do - so tell the GC to ignore it
+					GC.SuppressFinalize(this);
 				}
 
 				// free unmanaged resources here
-
 				_isAlreadyDisposed = true;
-				// nothing for Finalizer to do - so tell the GC to ignore it
-				GC.SuppressFinalize(this);
 			}
 			_context?.Dispose();
 		}

src/NHibernate/Transaction/AdoTransaction.cs

@@ -387,13 +387,13 @@ protected virtual void Dispose(bool isDisposing)
 						// Assume we are rolled back
 						AfterTransactionCompletion(false);
 					}
+					// nothing for Finalizer to do - so tell the GC to ignore it
+					GC.SuppressFinalize(this);
 				}
 
 				// free unmanaged resources here
 
 				_isAlreadyDisposed = true;
-				// nothing for Finalizer to do - so tell the GC to ignore it
-				GC.SuppressFinalize(this);
 			}
 		}
 

src/NHibernate/Util/JoinedEnumerable.cs

@@ -159,13 +159,13 @@ private void Dispose(bool isDisposing)
 							currentDisposable.Dispose();
 						}
 					}
+					// nothing for Finalizer to do - so tell the GC to ignore it
+					GC.SuppressFinalize(this);
 				}
 
 				// free unmanaged resources here
 
 				_isAlreadyDisposed = true;
-				// nothing for Finalizer to do - so tell the GC to ignore it
-				GC.SuppressFinalize(this);
 			}
 
 			#endregion
@@ -241,17 +241,18 @@ T IEnumerator<T>.Current
 			public void Dispose()
 			{
 				Dispose(true);
-				GC.SuppressFinalize(this);
 			}
 
 			private void Dispose(bool disposing)
 			{
 				if (!disposed)
 				{
 					if (disposing)
+					{
 						for (; currentEnumIdx < enumerators.Length; currentEnumIdx++)
 							enumerators[currentEnumIdx].Dispose();
-					GC.SuppressFinalize(this);
+						GC.SuppressFinalize(this);
+					}
 					disposed = true;
 				}
 			}