HHH-8276 - Integrate LoadPlans into UniqueEntityLoader (PoC)

Author: gbadner

hibernate-core/src/main/java/org/hibernate/loader/plan2/exec/process/internal/EntityReferenceInitializerImpl.java

@@ -283,14 +283,12 @@ private void handleMissingIdentifier(ResultSetProcessingContext context) {
 			}
 
 			final EntityKey ownerEntityKey = fetchOwnerState.getEntityKey();
-			if ( ownerEntityKey == null ) {
-				throw new IllegalStateException( "Could not locate fetch owner EntityKey" );
+			if ( ownerEntityKey != null ) {
+				context.getSession().getPersistenceContext().addNullProperty(
+						ownerEntityKey,
+						fetchedType.getPropertyName()
+				);
 			}
-
-			context.getSession().getPersistenceContext().addNullProperty(
-					ownerEntityKey,
-					fetchedType.getPropertyName()
-			);
 		}
 	}
 

hibernate-core/src/main/java/org/hibernate/persister/walking/internal/CompositionSingularSubAttributesHelper.java

@@ -131,7 +131,9 @@ public AttributeDefinition next() {
 						final int columnSpan = type.getColumnSpan( ownerEntityPersister.getFactory() );
 						final String[] subAttributeLhsColumns = ArrayHelper.slice( lhsColumns, columnPosition, columnSpan );
 
-						final boolean nullable = compositeType.getPropertyNullability()[subAttributeNumber];
+
+						final boolean[] propertyNullability = compositeType.getPropertyNullability();
+						final boolean nullable = propertyNullability == null || propertyNullability[subAttributeNumber];
 
 						currentColumnPosition += columnSpan;