HHH-15794 NullPointerException when constructing mapping model for ne…

…sted embeddables with not optional ManyToOne
hibernate · Jan 4, 2023 · f6354ff · f6354ff
1 parent 577180b
commit f6354ff
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...te-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java b/...te-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
@@ -277,9 +277,10 @@ && equal( join.getKey(), manyToOne ) ) {
 			else {
 				final String targetTableName = MappingModelCreationHelper.getTableIdentifierExpression( manyToOne.getTable(), declaringEntityPersister.getFactory() );
 				if ( CollectionPart.Nature.fromNameExact( navigableRole.getParent().getLocalName() ) != null ) {
-					final PluralAttributeMapping pluralAttribute = (PluralAttributeMapping) declaringEntityPersister.resolveSubPart(
-							navigableRole.getParent().getParent()
-					);
+					final PluralAttributeMapping pluralAttribute = (PluralAttributeMapping) declaringEntityPersister.findByPath(
+							navigableRole.getParent().getParent().getFullPath().substring( declaringEntityPersister.getNavigableRole().getFullPath().length() + 1 )  );
+					assert pluralAttribute != null;
+
 					final QueryableCollection persister = (QueryableCollection) pluralAttribute.getCollectionDescriptor();
 					isKeyTableNullable = !persister.getTableName().equals( targetTableName );
 				}