Skip to content

Commit 4b68e6d

Browse files
dreab8beikov
authored andcommitted
HHH-15279 NPE with Id on OneToOne referencing entity with multi-level EmbeddedId
1 parent f6b6e73 commit 4b68e6d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.hibernate.metamodel.mapping.JdbcMapping;
2222
import org.hibernate.metamodel.mapping.ManagedMappingType;
2323
import org.hibernate.metamodel.mapping.ModelPart;
24+
import org.hibernate.metamodel.mapping.PropertyBasedMapping;
2425
import org.hibernate.metamodel.mapping.SelectableConsumer;
2526
import org.hibernate.metamodel.mapping.SelectableMappings;
2627
import org.hibernate.metamodel.model.domain.NavigableRole;
@@ -142,7 +143,9 @@ public EmbeddedAttributeMapping(
142143
null,
143144
inverseModelPart.getMappedFetchOptions(),
144145
keyDeclaringType,
145-
null,
146+
inverseModelPart instanceof PropertyBasedMapping ?
147+
( (PropertyBasedMapping) inverseModelPart ).getPropertyAccess() :
148+
null,
146149
null
147150
);
148151

0 commit comments

Comments
 (0)