HHH-15662 ClasscastException caused by check for Managed rather than ManagedEntity

Author: Sanne

hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java

@@ -25,7 +25,6 @@
 import java.util.function.Consumer;
 
 import static org.hibernate.engine.internal.ManagedTypeHelper.asManagedEntity;
-import static org.hibernate.engine.internal.ManagedTypeHelper.isManaged;
 import static org.hibernate.engine.internal.ManagedTypeHelper.isManagedEntity;
 
 /**
@@ -95,7 +94,7 @@ public void addEntityEntry(Object entity, EntityEntry entityEntry) {
 		ManagedEntity managedEntity = getAssociatedManagedEntity( entity );
 		final boolean alreadyAssociated = managedEntity != null;
 		if ( !alreadyAssociated ) {
-			if ( isManaged( entity ) ) {
+			if ( isManagedEntity( entity ) ) {
 				final ManagedEntity managed = asManagedEntity( entity );
 				if ( entityEntry.getPersister().isMutable() ) {
 					managedEntity = managed;
@@ -155,7 +154,7 @@ public void addEntityEntry(Object entity, EntityEntry entityEntry) {
 	}
 
 	private ManagedEntity getAssociatedManagedEntity(Object entity) {
-		if ( isManaged( entity ) ) {
+		if ( isManagedEntity( entity ) ) {
 			final ManagedEntity managedEntity = asManagedEntity( entity );
 			if ( managedEntity.$$_hibernate_getEntityEntry() == null ) {
 				// it is not associated

hibernate-core/src/main/java/org/hibernate/engine/internal/ManagedTypeHelper.java

@@ -56,14 +56,6 @@ public static boolean isManagedType(final Class type) {
 		return EnhancedEntity.class.isAssignableFrom( type ) || Managed.class.isAssignableFrom( type );
 	}
 
-	/**
-	 * @param entity
-	 * @return true if and only if the entity implements {@see Managed}
-	 */
-	public static boolean isManaged(final Object entity) {
-		return entity instanceof EnhancedEntity || entity instanceof Managed;
-	}
-
 	/**
 	 * @param entity
 	 * @return true if and only if the entity implements {@see ManagedEntity}