Branch: refs/heads/5.1 Home: https://github.com/hibernate/hibernate-orm Commit: 40bb7d518c8c7b153496eceffa92a620ccee2a3c https://github.com/hibernate/hibernate-orm/commit/40bb7d518c8c7b153496ece... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2016-05-27 (Fri, 27 May 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/FetchStyleLoadPlanBuildingAssociationVisitationStrategy.java M hibernate-core/src/main/java/org/hibernate/loader/plan/exec/internal/EntityLoadQueryDetails.java M hibernate-core/src/main/java/org/hibernate/loader/plan/exec/process/internal/EntityReferenceInitializerImpl.java M hibernate-core/src/main/java/org/hibernate/persister/walking/internal/EntityIdentifierDefinitionHelper.java M hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Channel.java M hibernate-core/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java M hibernate-core/src/test/java/org/hibernate/test/loadplans/plans/LoadPlanStructureAssertionTest.java Log Message: ----------- HHH-10476 : Getting an entity with composite ID containing a detached entity fails if PersistenceContext contains a managed copy (cherry picked from commit f2427fa28a5ba358fb73997d082879e0c610022e)