HHH-15279 NPE with Id on OneToOne referencing entity with multi-level…

… EmbeddedId
hibernate · May 23, 2022 · 81d749e · 81d749e
1 parent 4066fe0
commit 81d749e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java b/...core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
@@ -21,6 +21,7 @@
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.ManagedMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
+import org.hibernate.metamodel.mapping.PropertyBasedMapping;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.SelectableMappings;
 import org.hibernate.metamodel.model.domain.NavigableRole;
@@ -142,7 +143,9 @@ public EmbeddedAttributeMapping(
 				null,
 				inverseModelPart.getMappedFetchOptions(),
 				keyDeclaringType,
-				null,
+				inverseModelPart instanceof PropertyBasedMapping ?
+						( (PropertyBasedMapping) inverseModelPart ).getPropertyAccess() :
+						null,
 				null
 		);