From 3fb4a8d596015fecb22f17b2452291942f7859f7 Mon Sep 17 00:00:00 2001
From: Andrea Boriero <andrea@hibernate.org>
Date: Wed, 24 Jan 2024 14:36:30 +0100
Subject: [PATCH] HHH-17674 NullPointerException thrown when loading entity
 previously evicted and proxied

---
 .../hibernate/engine/internal/StatefulPersistenceContext.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
index 057d42a84c..020ad85921 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
@@ -515,6 +515,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
 		if ( holder != null ) {
 			final Object entity = holder.entity;
 			if ( holder.proxy != null ) {
+				holder.entity = null;
 				entitiesByKey.put( key, holder );
 			}
 			return entity;