Skip to content

Do not leave AdoTransaction in an inconsistent state #2888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2021
Merged

Do not leave AdoTransaction in an inconsistent state #2888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions src/NHibernate/Async/Transaction/AdoTransaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,20 +170,29 @@ protected virtual async Task DisposeAsync(bool isDisposing, CancellationToken ca
// know this call came through Dispose()
if (isDisposing)
{
if (trans != null)
try
{
trans.Dispose();
trans = null;
log.Debug("DbTransaction disposed.");
}
if (trans != null)
{
trans.Dispose();
trans = null;
log.Debug("DbTransaction disposed.");
}

if (IsActive && session != null)
if (IsActive && session != null)
{
// 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);
}
finally
{
// Assume we are rolled back
await (AfterTransactionCompletionAsync(false, cancellationToken)).ConfigureAwait(false);
// Do not leave the object in an inconsistent state in case of disposal failure: we should assume
// the DbTransaction is either no more ongoing or unrecoverable.
begun = false;
}
// nothing for Finalizer to do - so tell the GC to ignore it
GC.SuppressFinalize(this);
}

// free unmanaged resources here
Expand Down
29 changes: 19 additions & 10 deletions src/NHibernate/Transaction/AdoTransaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,20 +376,29 @@ protected virtual void Dispose(bool isDisposing)
// know this call came through Dispose()
if (isDisposing)
{
if (trans != null)
try
{
trans.Dispose();
trans = null;
log.Debug("DbTransaction disposed.");
if (trans != null)
{
trans.Dispose();
trans = null;
log.Debug("DbTransaction disposed.");
}

if (IsActive && session != null)
{
// Assume we are rolled back
AfterTransactionCompletion(false);
}
// nothing for Finalizer to do - so tell the GC to ignore it
GC.SuppressFinalize(this);
}

if (IsActive && session != null)
finally
{
// Assume we are rolled back
AfterTransactionCompletion(false);
// Do not leave the object in an inconsistent state in case of disposal failure: we should assume
// the DbTransaction is either no more ongoing or unrecoverable.
begun = false;
}
// nothing for Finalizer to do - so tell the GC to ignore it
GC.SuppressFinalize(this);
}

// free unmanaged resources here
Expand Down