HHH-17156 Skip initialization for different subtype embeddables

hibernate · Sep 18, 2023 · b38bc76 · b38bc76
1 parent 32605a5
commit b38bc76
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...c/main/java/org/hibernate/sql/results/graph/embeddable/AbstractEmbeddableInitializer.java b/...c/main/java/org/hibernate/sql/results/graph/embeddable/AbstractEmbeddableInitializer.java
@@ -267,6 +267,10 @@ private State determinInitialState(){
 				// parent instance is null;
 				return State.NULL;
 			}
+			else if ( !entityInitializer.getConcreteDescriptor().isTypeOrSuperType( embedded.findContainingEntityMapping() ) ) {
+				// parent instance is of a supertype which doesn't contain this embeddable
+				return State.NULL;
+			}
 			else if ( entityInitializer.isEntityInitialized() ) {
 				// parent instance has been initialized, we do not need to inject the state
 				return State.INJECTED;