HHH-18608 NPE in EntityInitializerImpl.resolveInstanceSubInitializers

hibernate · Sep 18, 2024 · 094a9a1 · 094a9a1
1 parent b491870
commit 094a9a1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.../src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java b/.../src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java
@@ -625,6 +625,10 @@ protected void resolveInstanceSubInitializers(EntityInitializerData data) {
 		final EntityEntry entityEntry = data.entityHolder.getEntityEntry();
 		final Initializer<?>[] initializers;
 		final ImmutableBitSet maybeLazySet;
+		if ( entityEntry == null ) {
+			assert data.entityHolder.getEntityInitializer() != null && data.entityHolder.getProxy() != null;
+			return;
+		}
 		if ( data.entityHolder.getEntityInitializer() == this ) {
 			// When a previous row initialized this entity already, we only need to process collections
 			initializers = collectionContainingSubInitializers[subclassId];