From 2de4277c34258f35992000267fefe806e58d8f2b Mon Sep 17 00:00:00 2001
From: Christian Beikov <christian.beikov@gmail.com>
Date: Fri, 13 Apr 2018 15:55:24 +0200
Subject: [PATCH] HHH-12486 - Avoid unnecessary exceptions during entity
 persister lookup during query compilation

---
 .../hql/internal/ast/util/SessionFactoryHelper.java       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/SessionFactoryHelper.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/SessionFactoryHelper.java
index 383af44f97..9fb7b590c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/SessionFactoryHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/SessionFactoryHelper.java
@@ -138,11 +138,9 @@ public class SessionFactoryHelper {
 	 */
 	public EntityPersister findEntityPersisterByName(String name) throws MappingException {
 		// First, try to get the persister using the given name directly.
-		try {
-			return sfi.getMetamodel().entityPersister( name );
-		}
-		catch ( MappingException ignore ) {
-			// unable to locate it using this name
+		EntityPersister persister = sfi.getMetamodel().entityPersisters().get( name );
+		if ( persister != null ) {
+			return persister;
 		}
 
 		// If that didn't work, try using the 'import' name.