Fix KeyNotFoundException in StatefulPersistenceContext.RemoveEntity on Evict

hazzik · hazzik · commit f8cddc0641ca · 2020-05-19T02:30:28.000+12:00
Fixes #1310
diff --git a/src/NHibernate/Engine/StatefulPersistenceContext.cs b/src/NHibernate/Engine/StatefulPersistenceContext.cs
@@ -443,10 +443,7 @@ public bool ContainsEntity(EntityKey key)
 		/// </summary>
 		public object RemoveEntity(EntityKey key)
 		{
-			if (!entitiesByKey.Remove(key, out var tempObject))
-				throw new KeyNotFoundException(key.ToString());
-
-			object entity = tempObject;
+			entitiesByKey.Remove(key, out var entity);
 			List<EntityUniqueKey> toRemove = new List<EntityUniqueKey>();
 			foreach (KeyValuePair<EntityUniqueKey, object> pair in entitiesByUniqueKey)
 			{

Original file line number	Diff line number	Diff line change
`@@ -443,10 +443,7 @@ public bool ContainsEntity(EntityKey key)`
`443`	`443`	`/// </summary>`
`444`	`444`	`public object RemoveEntity(EntityKey key)`
`445`	`445`	`{`
`446`		`- if (!entitiesByKey.Remove(key, out var tempObject))`
`447`		`- throw new KeyNotFoundException(key.ToString());`
`448`		`-`
`449`		`- object entity = tempObject;`
	`446`	`+ entitiesByKey.Remove(key, out var entity);`
`450`	`447`	`List<EntityUniqueKey> toRemove = new List<EntityUniqueKey>();`
`451`	`448`	`foreach (KeyValuePair<EntityUniqueKey, object> pair in entitiesByUniqueKey)`
`452`	`449`	`{`