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

Author: dreab8

hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java

@@ -55,6 +55,7 @@
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
+import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.exec.spi.Callback;
 import org.hibernate.sql.results.graph.entity.EntityInitializer;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingState;
@@ -405,6 +406,11 @@ public EntityHolder claimEntityHolderIfPossible(
 		else {
 			newEntityHolder = null;
 		}
+
+		// We need the "original" navigable path in case of subselect in order to retrieve the correct TableGroup
+		if ( holder.entityInitializer == null ) {
+			holder.navigablePath = initializer.getNavigablePath();
+		}
 		holder.entityInitializer = initializer;
 		return holder;
 	}
@@ -2176,6 +2182,7 @@ private static class EntityHolderImpl implements EntityHolder, Serializable {
 		private @Nullable EntityEntry entityEntry;
 		private EntityInitializer<?> entityInitializer;
 		private EntityHolderState state;
+		private NavigablePath navigablePath;
 
 		private EntityHolderImpl() {
 			this.state = EntityHolderState.UNINITIALIZED;
@@ -2201,6 +2208,11 @@ public EntityPersister getDescriptor() {
 			return descriptor;
 		}
 
+		@Override
+		public NavigablePath getNavigablePath() {
+			return navigablePath;
+		}
+
 		@Override
 		public Object getEntity() {
 			return entity;

hibernate-core/src/main/java/org/hibernate/engine/spi/EntityHolder.java

@@ -7,6 +7,7 @@
 import org.hibernate.Incubating;
 import org.hibernate.Internal;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.results.graph.entity.EntityInitializer;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingState;
 
@@ -22,6 +23,8 @@ public interface EntityHolder {
 	EntityKey getEntityKey();
 	EntityPersister getDescriptor();
 
+	NavigablePath getNavigablePath();
+
 	/**
 	 * The entity object, or {@code null} if no entity object was registered yet.
 	 */

hibernate-core/src/main/java/org/hibernate/engine/spi/SubselectFetch.java

@@ -10,14 +10,12 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hibernate.internal.util.NullnessUtil;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
-import org.hibernate.sql.results.graph.entity.EntityInitializer;
 
 /**
  * Encapsulates details related to entities which contain sub-select-fetchable
@@ -149,14 +147,13 @@ private StandardRegistrationHandler(
 		public void addKey(EntityHolder holder) {
 			if ( batchFetchQueue.getSession().getLoadQueryInfluencers()
 					.hasSubselectLoadableCollections( holder.getDescriptor() ) ) {
-				final EntityInitializer<?> entityInitializer = NullnessUtil.castNonNull( holder.getEntityInitializer() );
 				final SubselectFetch subselectFetch = subselectFetches.computeIfAbsent(
-						entityInitializer.getNavigablePath(),
+						holder.getNavigablePath(),
 						navigablePath -> new SubselectFetch(
 								loadingSqlAst.getQuerySpec(),
 								loadingSqlAst.getQuerySpec()
 										.getFromClause()
-										.findTableGroup( entityInitializer.getNavigablePath() ),
+										.findTableGroup( holder.getNavigablePath() ),
 								loadingJdbcParameters,
 								loadingJdbcParameterBindings,
 								new HashSet<>()