Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "HHH-12592 - Fix merging detached enhanced entities with orphan-removal collections." 

This reverts commit 4f119105f8.
This commit is contained in:
Gail Badner 2018-05-24 23:56:26 -07:00 committed by Sanne Grinovero
parent c3c0cd550f
commit e1b08967d9
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
View File

@ -689,15 +689,10 @@ public abstract class CollectionType extends AbstractType implements Association
// for a null target, or a target which is the same as the original, we // 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 // need to put the merged elements in a new collection
Object result; Object result = ( target == null ||
if ( target == LazyPropertyInitializer.UNFETCHED_PROPERTY ) { target == original ||
result = original; target == LazyPropertyInitializer.UNFETCHED_PROPERTY ) ?
} instantiateResult( original ) : target;
else {
result = ( target == null || target == original ) ?
instantiateResult( original ) :
target;
}
//for arrays, replaceElements() may return a different reference, since //for arrays, replaceElements() may return a different reference, since
//the array length might not match //the array length might not match