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

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

(cherry picked from commit 4f11910)
This commit is contained in:
Chris Cranford 2018-05-24 16:30:09 -04:00
parent 15271913f5
commit 152a8b30db
1 changed files with 9 additions and 4 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

@ -687,10 +687,15 @@ public abstract class CollectionType extends AbstractType implements Association
// 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