Skip to content

Commit 54b809c

Browse files
committed
HHH-18486 Prioritize custom name-resolvers before defaulting to dynamic
1 parent bc2a232 commit 54b809c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ public String resolveEntityName(Object entity) {
3030
return entityName;
3131
}
3232

33-
final MappingMetamodelImplementor mappingMetamodel = sessionFactory.getRuntimeMetamodels().getMappingMetamodel();
34-
for ( EntityNameResolver resolver : mappingMetamodel.getEntityNameResolvers() ) {
33+
for ( EntityNameResolver resolver : sessionFactory.getSessionFactoryOptions().getEntityNameResolvers() ) {
3534
entityName = resolver.resolveEntityName( entity );
3635
if ( entityName != null ) {
3736
return entityName;
3837
}
3938
}
4039

41-
for ( EntityNameResolver resolver : sessionFactory.getSessionFactoryOptions().getEntityNameResolvers() ) {
40+
final MappingMetamodelImplementor mappingMetamodel = sessionFactory.getRuntimeMetamodels().getMappingMetamodel();
41+
for ( EntityNameResolver resolver : mappingMetamodel.getEntityNameResolvers() ) {
4242
entityName = resolver.resolveEntityName( entity );
4343
if ( entityName != null ) {
4444
return entityName;

0 commit comments

Comments
 (0)