Ensure that we delist the trigger session on exception in the BeforeSaveAsync cycle

koenbeuk · koenbeuk · commit 6dce097c4951 · 2022-12-11T13:49:03.000Z
diff --git a/src/EntityFrameworkCore.Triggered/Internal/TriggerSessionSaveChangesInterceptor.cs b/src/EntityFrameworkCore.Triggered/Internal/TriggerSessionSaveChangesInterceptor.cs
@@ -123,6 +123,12 @@ public async ValueTask<InterceptionResult<int>> SavingChangesAsync(DbContextEven
                 _triggerSession.RaiseBeforeSaveCompletedTriggers();
                 await _triggerSession.RaiseBeforeSaveCompletedAsyncTriggers(cancellationToken).ConfigureAwait(false);
             }
+            catch
+            {
+                // We're aborting the SaveChanges call, delist the trigger session now
+                DelistTriggerSession(eventData);
+                throw;
+            }
             finally
             {
                 eventData.Context.ChangeTracker.AutoDetectChangesEnabled = defaultAutoDetectChangesEnabled;

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,12 @@ public async ValueTask<InterceptionResult<int>> SavingChangesAsync(DbContextEven`
`123`	`123`	`_triggerSession.RaiseBeforeSaveCompletedTriggers();`
`124`	`124`	`await _triggerSession.RaiseBeforeSaveCompletedAsyncTriggers(cancellationToken).ConfigureAwait(false);`
`125`	`125`	`}`
	`126`	`+ catch`
	`127`	`+ {`
	`128`	`+ // We're aborting the SaveChanges call, delist the trigger session now`
	`129`	`+ DelistTriggerSession(eventData);`
	`130`	`+ throw;`
	`131`	`+ }`
`126`	`132`	`finally`
`127`	`133`	`{`
`128`	`134`	`eventData.Context.ChangeTracker.AutoDetectChangesEnabled = defaultAutoDetectChangesEnabled;`