Stateless Session with deduplicated result with join fetch

unknown · oskarb · commit c436a8c19818 · 2014-10-22T21:58:31.000+02:00
diff --git a/src/NHibernate/Impl/StatelessSessionImpl.cs b/src/NHibernate/Impl/StatelessSessionImpl.cs
@@ -316,7 +316,13 @@ public override bool IsEventSource
 		public override object GetEntityUsingInterceptor(EntityKey key)
 		{
 			CheckAndUpdateSessionStatus();
-			return null;
+            // while a pending Query we should use existing temporary entities so a join fetch does not create multiple instances
+            // of the same parent item
+            object obj;
+            if (temporaryPersistenceContext.EntitiesByKey.TryGetValue(key, out obj))
+                return obj;
+            else
+			    return null;
 		}
 
 		public override IPersistenceContext PersistenceContext

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,13 @@ public override bool IsEventSource`
`316`	`316`	`public override object GetEntityUsingInterceptor(EntityKey key)`
`317`	`317`	`{`
`318`	`318`	`CheckAndUpdateSessionStatus();`
`319`		`- return null;`
	`319`	`+ // while a pending Query we should use existing temporary entities so a join fetch does not create multiple instances`
	`320`	`+ // of the same parent item`
	`321`	`+ object obj;`
	`322`	`+ if (temporaryPersistenceContext.EntitiesByKey.TryGetValue(key, out obj))`
	`323`	`+ return obj;`
	`324`	`+ else`
	`325`	`+ return null;`
`320`	`326`	`}`
`321`	`327`
`322`	`328`	`public override IPersistenceContext PersistenceContext`