Skip to content

Commit 5228f30

Browse files
committed
HHH-18608 NPE in EntityInitializerImpl.resolveInstanceSubInitializers
1 parent f26d77c commit 5228f30

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,10 @@ protected void resolveInstanceSubInitializers(EntityInitializerData data) {
634634
}
635635
else {
636636
initializers = subInitializersForResolveFromInitialized[subclassId];
637+
if ( entityEntry == null ) {
638+
assert data.entityHolder.getEntityInitializer() != null && data.entityHolder.getProxy() != null;
639+
return;
640+
}
637641
maybeLazySet = entityEntry.getMaybeLazySet();
638642
// Skip resolving if this initializer has no sub-initializers
639643
// or the lazy set of this initializer is a superset/contains the entity entry maybeLazySet

0 commit comments

Comments
 (0)