HHH-17674 NullPointerException thrown when loading entity previously evicted and proxied

dreab8 · beikov · commit f2a699bafaf7 · 2024-01-24T18:30:15.000+01:00
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
@@ -515,6 +515,7 @@ public Object removeEntity(EntityKey key) {
 		if ( holder != null ) {
 			final Object entity = holder.entity;
 			if ( holder.proxy != null ) {
+				holder.entity = null;
 				entitiesByKey.put( key, holder );
 			}
 			return entity;

Original file line number	Diff line number	Diff line change
`@@ -515,6 +515,7 @@ public Object removeEntity(EntityKey key) {`
`515`	`515`	`if ( holder != null ) {`
`516`	`516`	`final Object entity = holder.entity;`
`517`	`517`	`if ( holder.proxy != null ) {`
	`518`	`+ holder.entity = null;`
`518`	`519`	`entitiesByKey.put( key, holder );`
`519`	`520`	`}`
`520`	`521`	`return entity;`