From 106df75f20c08c8bc1717139c583335451676fba Mon Sep 17 00:00:00 2001
From: Gail Badner <gbadner@redhat.com>
Date: Sun, 28 Mar 2021 15:13:00 -0700
Subject: [PATCH] HHH-14537 EntityNotFoundException thrown when non-existing
 association with @NotFound(IGNORE) mapped has proxy in PersistenceContext

(cherry picked from commit 3c1e16e06ce7232fbe69bf1a3322d3f251a8bfbb)
---
 .../event/internal/DefaultLoadEventListener.java  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
index 48af0592cf..103ddc7daf 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
@@ -367,10 +367,17 @@ private Object returnNarrowedProxy(
 		if ( !options.isAllowProxyCreation() ) {
 			impl = load( event, persister, keyToLoad, options );
 			if ( impl == null ) {
-				event.getSession()
-						.getFactory()
-						.getEntityNotFoundDelegate()
-						.handleEntityNotFound( persister.getEntityName(), keyToLoad.getIdentifier() );
+				if ( options == LoadEventListener.INTERNAL_LOAD_NULLABLE ) {
+					// The proxy is for a non-existing association mapped as @NotFound.
+					// Don't throw an exeption; just return null.
+					return null;
+				}
+				else {
+					event.getSession()
+							.getFactory()
+							.getEntityNotFoundDelegate()
+							.handleEntityNotFound( persister.getEntityName(), keyToLoad.getIdentifier() );
+				}
 			}
 		}