From 70137e7f09281f13f0714f88344ed725282aab76 Mon Sep 17 00:00:00 2001
From: Marco Belladelli <marcobladel@gmail.com>
Date: Thu, 22 Aug 2024 10:39:31 +0200
Subject: [PATCH] HHH-18486 Prioritize custom name-resolvers before defaulting
 to dynamic

---
 .../hibernate/internal/CoordinatingEntityNameResolver.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java b/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java
index d325f36cb5..2ba0bfb3e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java
@@ -30,15 +30,15 @@ public class CoordinatingEntityNameResolver implements EntityNameResolver {
 			return entityName;
 		}
 
-		final MappingMetamodelImplementor mappingMetamodel = sessionFactory.getRuntimeMetamodels().getMappingMetamodel();
-		for ( EntityNameResolver resolver : mappingMetamodel.getEntityNameResolvers() ) {
+		for ( EntityNameResolver resolver : sessionFactory.getSessionFactoryOptions().getEntityNameResolvers() ) {
 			entityName = resolver.resolveEntityName( entity );
 			if ( entityName != null ) {
 				return entityName;
 			}
 		}
 
-		for ( EntityNameResolver resolver : sessionFactory.getSessionFactoryOptions().getEntityNameResolvers() ) {
+		final MappingMetamodelImplementor mappingMetamodel = sessionFactory.getRuntimeMetamodels().getMappingMetamodel();
+		for ( EntityNameResolver resolver : mappingMetamodel.getEntityNameResolvers() ) {
 			entityName = resolver.resolveEntityName( entity );
 			if ( entityName != null ) {
 				return entityName;