From 81d749e93066e720a2779976c99348a2cb14bcec Mon Sep 17 00:00:00 2001
From: Andrea Boriero <andrea@hibernate.org>
Date: Wed, 18 May 2022 14:58:45 +0200
Subject: [PATCH] HHH-15279 NPE with Id on OneToOne referencing entity with
 multi-level EmbeddedId

---
 .../metamodel/mapping/internal/EmbeddedAttributeMapping.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
index b0988f17fce9..116e78e2e582 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
+++ b/hibernate-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
 		);