HHH-18289 with leads to HibernateException: A collection with cascade= was no longer referenced by the owning entity instance

Author: dreab8

hibernate-core/src/main/java/org/hibernate/type/CollectionType.java

@@ -638,6 +638,14 @@ public Object replace(
 			final Object owner,
 			final Map<Object, Object> copyCache) throws HibernateException {
 		if ( original == null ) {
+			if ( target == null ) {
+				return null;
+			}
+			if ( target instanceof PersistentCollection ) {
+				final Collection collection = (Collection) target;
+				collection.clear();
+				return collection;
+			}
 			return null;
 		}
 		if ( !Hibernate.isInitialized( original ) ) {