HHH-18544 multiload() and findAll() should return existing proxies

Author: gavinking

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java

@@ -218,6 +218,9 @@ protected <K> List<E> performOrderedMultiLoad(K[] ids, MultiIdLoadOptions loadOp
 					// the entity is locally deleted, and the options ask that we not return such entities...
 					entity = null;
 				}
+				else {
+					entity = persistenceContext.proxyFor( entity );
+				}
 			}
 			result.set( resultIndex, entity );
 		}

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderStandard.java

@@ -188,6 +188,9 @@ protected List<T> performOrderedMultiLoad(
 					// the entity is locally deleted, and the options ask that we not return such entities...
 					entity = null;
 				}
+				else {
+					entity = persistenceContext.proxyFor( entity );
+				}
 			}
 			result.set( position, entity );
 		}

hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindAllTest.java

@@ -12,6 +12,7 @@
 import static org.hibernate.ReadOnlyMode.READ_ONLY;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @SessionFactory
@@ -35,6 +36,11 @@ public class FindAllTest {
             assertTrue(s.isReadOnly(all.get(0)));
             assertTrue(s.isReadOnly(all.get(1)));
         });
+        scope.inTransaction(s-> {
+            Record record = s.getReference(Record.class, 456L);
+            List<Record> all = s.findAll(Record.class, List.of(456L, 123L));
+            assertSame(record, all.get(0));
+        });
     }
     @Entity
     static class Record {

hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java

@@ -276,7 +276,7 @@ public void testBasicMultiLoadWithManagedAndChecking(SessionFactoryScope scope)
 		);
 	}
 
-	@Test @FailureExpected(jiraKey = "HHH-18544")
+	@Test
 	public void testBasicMultiLoadWithManagedAndNoCheckingProxied(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -290,7 +290,7 @@ public void testBasicMultiLoadWithManagedAndNoCheckingProxied(SessionFactoryScop
 		);
 	}
 
-	@Test @FailureExpected(jiraKey = "HHH-18544")
+	@Test
 	public void testBasicMultiLoadWithManagedAndCheckingProxied(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {