Ensure that we delist the trigger session on exception in the BeforeSave cycle.

koenbeuk · koenbeuk · commit fc504840b2be · 2022-12-10T16:07:00.000Z
Closes #168
diff --git a/src/EntityFrameworkCore.Triggered/Internal/TriggerSessionSaveChangesInterceptor.cs b/src/EntityFrameworkCore.Triggered/Internal/TriggerSessionSaveChangesInterceptor.cs
@@ -80,14 +80,19 @@ public InterceptionResult<int> SavingChanges(DbContextEventData eventData, Inter
 
             try
             {
-
                 eventData.Context.ChangeTracker.AutoDetectChangesEnabled = false;
 
                 _triggerSession.RaiseBeforeSaveStartingTriggers();
                 _triggerSession.RaiseBeforeSaveTriggers();
                 _triggerSession.CaptureDiscoveredChanges();
                 _triggerSession.RaiseBeforeSaveCompletedTriggers();
             }
+            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
`@@ -80,14 +80,19 @@ public InterceptionResult<int> SavingChanges(DbContextEventData eventData, Inter`
`80`	`80`
`81`	`81`	`try`
`82`	`82`	`{`
`83`		`-`
`84`	`83`	`eventData.Context.ChangeTracker.AutoDetectChangesEnabled = false;`
`85`	`84`
`86`	`85`	`_triggerSession.RaiseBeforeSaveStartingTriggers();`
`87`	`86`	`_triggerSession.RaiseBeforeSaveTriggers();`
`88`	`87`	`_triggerSession.CaptureDiscoveredChanges();`
`89`	`88`	`_triggerSession.RaiseBeforeSaveCompletedTriggers();`
`90`	`89`	`}`
	`90`	`+ catch`
	`91`	`+ {`
	`92`	`+ // We're aborting the SaveChanges call, delist the trigger session now`
	`93`	`+ DelistTriggerSession(eventData);`
	`94`	`+ throw;`
	`95`	`+ }`
`91`	`96`	`finally`
`92`	`97`	`{`
`93`	`98`	`eventData.Context.ChangeTracker.AutoDetectChangesEnabled = defaultAutoDetectChangesEnabled;`