HHH-19874 NullPointerException in org.hibernate.sql.ast.tree.from.TableGroup.resolveTableReference

dreab8 · dreab8 · commit 23c3d0837e00 · 2025-10-24T12:52:35.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java
@@ -204,8 +204,10 @@ protected void initialize(EntitySelectFetchInitializerData data) {
 				}
 			}
 			else if ( holder.getEntityInitializer() != this ) {
-				// the entity is already being loaded elsewhere
-				data.setState( State.INITIALIZED );
+				// the entity is already being loaded elsewhere in this processing level
+				if ( holder.getJdbcValuesProcessingState() == rowProcessingState.getJdbcValuesSourceProcessingState() ) {
+					data.setState( State.INITIALIZED );
+				}
 				return;
 			}
 			else if ( data.getInstance() == null ) {

Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,10 @@ protected void initialize(EntitySelectFetchInitializerData data) {`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`	`else if ( holder.getEntityInitializer() != this ) {`
`207`		`- // the entity is already being loaded elsewhere`
`208`		`- data.setState( State.INITIALIZED );`
	`207`	`+ // the entity is already being loaded elsewhere in this processing level`
	`208`	`+ if ( holder.getJdbcValuesProcessingState() == rowProcessingState.getJdbcValuesSourceProcessingState() ) {`
	`209`	`+ data.setState( State.INITIALIZED );`
	`210`	`+ }`
`209`	`211`	`return;`
`210`	`212`	`}`
`211`	`213`	`else if ( data.getInstance() == null ) {`