HHH-16811 Dirty property lost and not detected with Batch Fetch, Embedded and FetchMode SELECT

hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AbstractEmbeddableInitializer.java

@@ -186,8 +186,8 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
 			case NULL:
 				return;
 			case INITIAL:
-				if ( isParentInstanceNull() ) {
+				state = determinInitialState();
-					state = State.NULL;
+				if ( state != State.INITIAL ) {
 					return;
 				}
 
@@ -269,9 +269,24 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
 		);
 	}
 
-	private boolean isParentInstanceNull() {
+	private State determinInitialState(){
+		final EntityInitializer entityInitializer = getOwningEntityInitializer();
+		if ( entityInitializer != null ) {
+			if ( entityInitializer.getParentKey() == null ) {
+				// parent instance is null;
+				return State.NULL;
+			}
+			else if ( entityInitializer.isEntityInitialized() ) {
+				// parent instance has been initialized, we do not need to inject the state
+				return State.INJECTED;
+			}
+		}
+		return State.INITIAL;
+	}
+
+	private EntityInitializer getOwningEntityInitializer() {
 		if ( isPartOfKey ) {
-			return false;
+			return null;
 		}
 		FetchParentAccess parentAccess = fetchParentAccess;
 
@@ -280,16 +295,11 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
 					: "isPartOfKey should have been true in this case";
 			parentAccess = parentAccess.getFetchParentAccess();
 		}
-
 		if ( parentAccess == null ) {
-			return false;
+			return null;
 		}
-
 		final EntityInitializer entityInitializer = parentAccess.asEntityInitializer();
-		if ( entityInitializer != null && entityInitializer.getParentKey() == null ) {
+		return entityInitializer;
-			return true;
-		}
-		return false;
 	}
 
 	private void extractRowState(RowProcessingState processingState) {

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

@@ -75,6 +75,7 @@ public abstract class AbstractBatchEntitySelectFetchInitializer extends Abstract
 			RowProcessingState rowProcessingState,
 			ToOneAttributeMapping referencedModelPart,
 			FetchParentAccess parentAccess) {
+
 		if ( state != State.UNINITIALIZED ) {
 			return;
 		}