@@ -76,14 +76,16 @@ public InterceptionResult<int> SavingChanges(DbContextEventData eventData, Inter
7676 if ( ! ( eventData . Context is TriggeredDbContext ) )
7777 {
7878 EnlistTriggerSession ( eventData ) ;
79+ Debug . Assert ( _triggerSession != null ) ;
7980
8081 var defaultAutoDetectChangesEnabled = eventData . Context . ChangeTracker . AutoDetectChangesEnabled ;
8182
8283 try
8384 {
85+
8486 eventData . Context . ChangeTracker . AutoDetectChangesEnabled = false ;
8587
86- _triggerSession ! . RaiseBeforeSaveTriggers ( ) . GetAwaiter ( ) . GetResult ( ) ;
88+ _triggerSession . RaiseBeforeSaveTriggers ( ) . GetAwaiter ( ) . GetResult ( ) ;
8789 _triggerSession . CaptureDiscoveredChanges ( ) ;
8890 }
8991 finally
@@ -101,15 +103,17 @@ public async ValueTask<InterceptionResult<int>> SavingChangesAsync(DbContextEven
101103 {
102104 if ( ! ( eventData . Context is TriggeredDbContext ) )
103105 {
104- EnlistTriggerSession ( eventData ) ;
106+ EnlistTriggerSession ( eventData ) ;
107+ Debug . Assert ( _triggerSession != null ) ;
105108
106109 var defaultAutoDetectChangesEnabled = eventData . Context . ChangeTracker . AutoDetectChangesEnabled ;
107110
108111 try
109112 {
113+
110114 eventData . Context . ChangeTracker . AutoDetectChangesEnabled = false ;
111115
112- await _triggerSession ! . RaiseBeforeSaveTriggers ( cancellationToken ) . ConfigureAwait ( false ) ;
116+ await _triggerSession . RaiseBeforeSaveTriggers ( cancellationToken ) . ConfigureAwait ( false ) ;
113117 _triggerSession . CaptureDiscoveredChanges ( ) ;
114118 }
115119 finally
@@ -139,9 +143,9 @@ public async ValueTask<int> SavedChangesAsync(SaveChangesCompletedEventData even
139143 {
140144 if ( ! ( eventData . Context is TriggeredDbContext ) )
141145 {
142- EnlistTriggerSession ( eventData ) ;
146+ Debug . Assert ( _triggerSession != null ) ;
143147
144- await _triggerSession ! . RaiseAfterSaveTriggers ( cancellationToken ) . ConfigureAwait ( false ) ;
148+ await _triggerSession . RaiseAfterSaveTriggers ( cancellationToken ) . ConfigureAwait ( false ) ;
145149
146150 DelistTriggerSession ( eventData ) ;
147151 }
@@ -153,9 +157,9 @@ public void SaveChangesFailed(DbContextErrorEventData eventData)
153157 {
154158 if ( ! ( eventData . Context is TriggeredDbContext ) )
155159 {
156- EnlistTriggerSession ( eventData ) ;
160+ Debug . Assert ( _triggerSession != null ) ;
157161
158- _triggerSession ! . RaiseAfterSaveFailedTriggers ( eventData . Exception ) . GetAwaiter ( ) . GetResult ( ) ;
162+ _triggerSession . RaiseAfterSaveFailedTriggers ( eventData . Exception ) . GetAwaiter ( ) . GetResult ( ) ;
159163
160164 DelistTriggerSession ( eventData ) ;
161165 }
@@ -165,9 +169,9 @@ public async Task SaveChangesFailedAsync(DbContextErrorEventData eventData, Canc
165169 {
166170 if ( ! ( eventData . Context is TriggeredDbContext ) )
167171 {
168- EnlistTriggerSession ( eventData ) ;
172+ Debug . Assert ( _triggerSession != null ) ;
169173
170- await _triggerSession ! . RaiseAfterSaveFailedTriggers ( eventData . Exception , cancellationToken ) . ConfigureAwait ( false ) ;
174+ await _triggerSession . RaiseAfterSaveFailedTriggers ( eventData . Exception , cancellationToken ) . ConfigureAwait ( false ) ;
171175
172176 DelistTriggerSession ( eventData ) ;
173177 }
0 commit comments