Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-17519 Initializing a lazy association with a non aggregate id causes a NPE

This commit is contained in:
Andrea Boriero 2023-12-05 14:49:20 +01:00 committed by Christian Beikov
parent 2969b112a5
commit 51d64b11a8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
View File

@ -947,6 +947,11 @@ public class ToOneAttributeMapping
final AssociationKey associationKey = foreignKeyDescriptor.getAssociationKey(); final AssociationKey associationKey = foreignKeyDescriptor.getAssociationKey();
final boolean associationKeyVisited = creationState.isAssociationKeyVisited( associationKey ); final boolean associationKeyVisited = creationState.isAssociationKeyVisited( associationKey );
if ( associationKeyVisited || bidirectionalAttributePath != null ) { if ( associationKeyVisited || bidirectionalAttributePath != null ) {
if ( !associationKeyVisited && creationState.isRegisteringVisitedAssociationKeys() ) {
// If the current association key hasn't been visited yet and we are registering keys,
// then there can't be a circular fetch
return null;
}
NavigablePath parentNavigablePath = fetchablePath.getParent(); NavigablePath parentNavigablePath = fetchablePath.getParent();
assert parentNavigablePath.equals( fetchParent.getNavigablePath() ); assert parentNavigablePath.equals( fetchParent.getNavigablePath() );
// The parent navigable path is {fk} if we are creating the domain result for the foreign key for a circular fetch // The parent navigable path is {fk} if we are creating the domain result for the foreign key for a circular fetch
@ -1005,12 +1010,6 @@ public class ToOneAttributeMapping
); );
} }
if ( !associationKeyVisited && creationState.isRegisteringVisitedAssociationKeys() ) {
// If the current association key hasn't been visited yet and we are registering keys,
// then there can't be a circular fetch
return null;
}
/* /*
class Child { class Child {
@OneToOne @OneToOne