Fix ghost entry in EntityReferenceMap after identity conflict during Add#38587
Closed
AndriySvyryd with Copilot wants to merge 3 commits into
Closed
Fix ghost entry in EntityReferenceMap after identity conflict during Add#38587AndriySvyryd with Copilot wants to merge 3 commits into
AndriySvyryd with Copilot wants to merge 3 commits into
Conversation
Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
When StartTracking throws (e.g. identity conflict), FireStateChanging had already moved the entry from the detached bucket to the added bucket in EntityReferenceMap. Roll back that move in a catch block via the new RevertStartTracking method so the entry is not left as a ghost in the wrong reference map bucket, which was corrupting SaveChanges row counts and causing HasChanges() to return false. Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix ChangeTracker.HasChanges() behavior when detaching entity
Fix ghost entry in EntityReferenceMap after identity conflict during Add
Jul 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ChangeTracker.HasChanges()could returnfalseandSaveChanges()could return an incorrect row count after catching an identity conflict exception and detaching the offending entity.Root cause
When
Add(entity)throws an identity conflict,FireStateChanginghad already moved the entry from the detached bucket to the added bucket inEntityReferenceMap. The outerSetEntityStatecorrectly restoresEntityState = Detached, butSetEntityState(Detached, Detached)is a no-op — so the entry is left as a ghost in_addedReferenceMapwithEntityState.Detached. This ghost inflatedSaveChangesrow counts and corruptedChangedCount.Changes
InternalEntityEntry.OnStateChanging— wrapStateManager.StartTracking(this)intry/catch; on failure, callStateManager.RevertStartTracking(this, newState)to undo the reference map move before rethrowing.IStateManager— newvoid RevertStartTracking(InternalEntityEntry entry, EntityState requestedState).StateManager— implementsRevertStartTrackingby delegating to the existing privateUpdateReferenceMaps(entry, entry.EntityState, requestedState), which removes the entry from the wrongly-placed bucket without adding it to the detached map.FakeStateManager— stub to satisfy the interface.StateManagerTest— four regression tests coveringHasChanges,ChangedCount,Entriesenumeration, andSaveChangesrow count after an identity conflict + detach.