HHH-15776 Avoid type checking for ManagedEntity in EntityEntryContext…

…#deserialize as well
hibernate · Nov 28, 2022 · e4c294f · e4c294f
1 parent c882699
commit e4c294f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
@@ -460,16 +460,17 @@ public static EntityEntryContext deserialize(ObjectInputStream ois, StatefulPers
 			final ManagedEntity managedEntity;
 			if ( isEnhanced ) {
 				if ( entry.getPersister().isMutable() ) {
-					managedEntity = (ManagedEntity) entity;
+					managedEntity = ManagedTypeHelper.asManagedEntity( entity );
 				}
 				else {
-					managedEntity = new ImmutableManagedEntityHolder( (ManagedEntity) entity );
+					final ManagedEntity castedEntity = asManagedEntity( entity );
+					managedEntity = new ImmutableManagedEntityHolder( castedEntity );
 					if ( context.immutableManagedEntityXref == null ) {
 						context.immutableManagedEntityXref =
 								new IdentityHashMap<>();
 					}
 					context.immutableManagedEntityXref.put(
-							(ManagedEntity) entity,
+							castedEntity,
 							(ImmutableManagedEntityHolder) managedEntity
 
 					);