[hibernate-commits] [hibernate/hibernate-orm] c1934b: HHH-5855 : Merge causes a duplicated "insert" of a...
Branch: refs/heads/5.0
Home: https://github.com/hibernate/hibernate-orm
Commit: c1934b72edb4f781520937618b3b750bebb84576
https://github.com/hibernate/hibernate-orm/commit/c1934b72edb4f7815209376...
Author: Gail Badner <gbadner(a)redhat.com>
Date: 2016-02-09 (Tue, 09 Feb 2016)
Changed paths:
M
hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
M hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentBag.java
M hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentList.java
M hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentMap.java
M hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentSet.java
M hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
M
hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java
A hibernate-core/src/test/java/org/hibernate/test/cascade/MergeTest.java
A
hibernate-core/src/test/java/org/hibernate/test/collection/bag/BagDuplicatesTest.java
A hibernate-core/src/test/java/org/hibernate/test/collection/bag/Item.java
M hibernate-core/src/test/java/org/hibernate/test/collection/bag/Mappings.hbm.xml
A hibernate-core/src/test/java/org/hibernate/test/collection/bag/Order.java
M
hibernate-core/src/test/java/org/hibernate/test/collection/bag/PersistentBagTest.java
A
hibernate-core/src/test/java/org/hibernate/test/collection/delayedOperation/BagDelayedOperationTest.java
A
hibernate-core/src/test/java/org/hibernate/test/collection/delayedOperation/ListDelayedOperationTest.java
A
hibernate-core/src/test/java/org/hibernate/test/collection/delayedOperation/SetDelayedOperationTest.java
A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/MergeTest.java
Log Message:
-----------
HHH-5855 : Merge causes a duplicated "insert" of a child entity in lazy
collection
(cherry picked from commit efa72a83336430b99c0f03a62294fae816485c04)