Skip to content

Commit 094a9a1

Browse files
committed
HHH-18608 NPE in EntityInitializerImpl.resolveInstanceSubInitializers
1 parent b491870 commit 094a9a1

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
@@ -625,6 +625,10 @@ protected void resolveInstanceSubInitializers(EntityInitializerData data) {
625625
final EntityEntry entityEntry = data.entityHolder.getEntityEntry();
626626
final Initializer<?>[] initializers;
627627
final ImmutableBitSet maybeLazySet;
628+
if ( entityEntry == null ) {
629+
assert data.entityHolder.getEntityInitializer() != null && data.entityHolder.getProxy() != null;
630+
return;
631+
}
628632
if ( data.entityHolder.getEntityInitializer() == this ) {
629633
// When a previous row initialized this entity already, we only need to process collections
630634
initializers = collectionContainingSubInitializers[subclassId];

0 commit comments

Comments
 (0)