Backport #169 into v3 branch

koenbeuk · Dec 11, 2022 · ec72f60 · ec72f60
1 parent b30af90
commit ec72f60
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/EntityFrameworkCore.Triggered/Internal/TriggerSessionSaveChangesInterceptor.cs b/src/EntityFrameworkCore.Triggered/Internal/TriggerSessionSaveChangesInterceptor.cs
@@ -90,6 +90,12 @@ public InterceptionResult<int> SavingChanges(DbContextEventData eventData, Inter
                     _triggerSession.CaptureDiscoveredChanges();
                     _triggerSession.RaiseBeforeSaveCompletedTriggers().GetAwaiter().GetResult();
                 }
+                catch
+                {
+                    // We're aborting the SaveChanges call, delist the trigger session now
+                    DelistTriggerSession(eventData);
+                    throw;
+                }
                 finally
                 {
                     eventData.Context.ChangeTracker.AutoDetectChangesEnabled = defaultAutoDetectChangesEnabled;
@@ -119,6 +125,12 @@ public async ValueTask<InterceptionResult<int>> SavingChangesAsync(DbContextEven
                     _triggerSession.CaptureDiscoveredChanges();
                     await _triggerSession.RaiseBeforeSaveCompletedTriggers(cancellationToken).ConfigureAwait(false);
                 }
+                catch
+                {
+                    // We're aborting the SaveChanges call, delist the trigger session now
+                    DelistTriggerSession(eventData);
+                    throw;
+                }
                 finally
                 {
                     eventData.Context.ChangeTracker.AutoDetectChangesEnabled = defaultAutoDetectChangesEnabled;