HHH-12592 - Fix merging detached enhanced entities with orphan-remova…

…l collections.

(cherry picked from commit 4f11910)

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

@@ -687,10 +687,15 @@ public Object replace(
 
 		// for a null target, or a target which is the same as the original, we
 		// need to put the merged elements in a new collection
-		Object result = ( target == null ||
-				target == original ||
-				target == LazyPropertyInitializer.UNFETCHED_PROPERTY ) ?
-				instantiateResult( original ) : target;
+		Object result;
+		if ( target == LazyPropertyInitializer.UNFETCHED_PROPERTY ) {
+			result = original;
+		}
+		else {
+			result = ( target == null || target == original ) ?
+					instantiateResult( original ) :
+					target;
+		}
 
 		//for arrays, replaceElements() may return a different reference, since
 		//the array length might not match