HHH-18608 NPE in EntityInitializerImpl.resolveInstanceSubInitializers

hibernate · Sep 16, 2024 · 5228f30 · 5228f30
1 parent f26d77c
commit 5228f30
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
@@ -634,6 +634,10 @@ protected void resolveInstanceSubInitializers(EntityInitializerData data) {
 		}
 		else {
 			initializers = subInitializersForResolveFromInitialized[subclassId];
+			if ( entityEntry == null ) {
+				assert data.entityHolder.getEntityInitializer() != null && data.entityHolder.getProxy() != null;
+				return;
+			}
 			maybeLazySet = entityEntry.getMaybeLazySet();
 			// Skip resolving if this initializer has no sub-initializers
 			// or the lazy set of this initializer is a superset/contains the entity entry maybeLazySet