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

@@ -405,7 +405,10 @@ public EntityHolder claimEntityHolderIfPossible(
 		else {
 			newEntityHolder = null;
 		}
-		holder.entityInitializer = initializer;
+		if ( holder.processingState != processingState ) {
+			holder.entityInitializer = initializer;
+			holder.processingState = processingState;
+		}
 		return holder;
 	}
 
@@ -2174,7 +2177,8 @@ private static class EntityHolderImpl implements EntityHolder, Serializable {
 		private Object entity;
 		private Object proxy;
 		private @Nullable EntityEntry entityEntry;
-		private EntityInitializer<?> entityInitializer;
+		private @Nullable EntityInitializer<?> entityInitializer;
+		private @Nullable JdbcValuesSourceProcessingState processingState;
 		private EntityHolderState state;
 
 		private EntityHolderImpl() {
@@ -2212,10 +2216,15 @@ public Object getProxy() {
 		}
 
 		@Override
-		public EntityInitializer<?> getEntityInitializer() {
+		public @Nullable EntityInitializer<?> getEntityInitializer() {
 			return entityInitializer;
 		}
 
+		@Override
+		public @Nullable JdbcValuesSourceProcessingState getJdbcValuesProcessingState() {
+			return processingState;
+		}
+
 		@Override
 		public void markAsReloaded(JdbcValuesSourceProcessingState processingState) {
 			processingState.registerReloadedEntityHolder( this );
@@ -2237,8 +2246,9 @@ public boolean isDetached() {
 		}
 
 		@Override
-		public void resetEntityInitialier(){
+		public void resetEntityInitialier() {
 			entityInitializer = null;
+			processingState = null;
 		}
 
 		public EntityHolderImpl withEntity(EntityKey entityKey, EntityPersister descriptor, Object entity) {
@@ -2253,6 +2263,7 @@ public EntityHolderImpl withData(EntityKey entityKey, EntityPersister descriptor
 			assert entityKey != null
 				&& descriptor != null
 				&& entityInitializer == null
+				&& processingState == null
 				&& state == EntityHolderState.UNINITIALIZED;
 			this.entityKey = entityKey;
 			this.descriptor = descriptor;

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

@@ -35,6 +35,11 @@ public interface EntityHolder {
 	 * Will be {@code null} if entity is initialized already or the entity holder is not claimed yet.
 	 */
 	@Nullable EntityInitializer<?> getEntityInitializer();
+	/**
+	 * The {@link JdbcValuesSourceProcessingState} for the entity initializer that claims to initialize the entity for this holder.
+	 * Will be {@code null} if entity is initialized already or the entity holder is not claimed yet.
+	 */
+	@Nullable JdbcValuesSourceProcessingState getJdbcValuesProcessingState();
 
 	/**
 	 * The proxy if there is one and otherwise the entity.

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

@@ -1187,7 +1187,12 @@ else if ( isResultInitializer() ) {
 					}
 				}
 				else if ( entityHolder.getEntityInitializer() != this ) {
-					data.setState( State.INITIALIZED );
+					// The other initializer will take care of initialization
+					if ( !hasLazyInitializingSubAssemblers ) {
+						// but we can only skip the initialization phase of this initializer,
+						// if this initializer does not initialize lazy basic attributes
+						data.setState( State.INITIALIZED );
+					}
 				}
 				else if ( data.shallowCached ) {
 					// For shallow cached entities, only the id is available, so ensure we load the data immediately