Branch: refs/heads/5.1 Home: https://github.com/hibernate/hibernate-orm Commit: 911d1a661d86059306a803578e4b53b27f2c0591 https://github.com/hibernate/hibernate-orm/commit/911d1a661d86059306a8035... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2016-12-15 (Thu, 15 Dec 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java A hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java Log Message: ----------- HHH-11328 : Persist of transient entity in derived ID that is already in merge process throws javax.persistence.EntityExistsException (cherry picked from commit 54f3409b4148c28a82c5a5849d802086e8aaeeda)