Branch: refs/heads/4.3 Home: https://github.com/hibernate/hibernate-orm Commit: 36bf5d0ef965a3bfc7a65faedd6f93cd97decf9b https://github.com/hibernate/hibernate-orm/commit/36bf5d0ef965a3bfc7a65fa... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2015-03-26 (Thu, 26 Mar 2015) Changed paths: M hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/returns/AbstractCollectionReference.java M hibernate-core/src/main/java/org/hibernate/loader/plan/exec/internal/AbstractCollectionLoadQueryDetails.java M hibernate-core/src/main/java/org/hibernate/loader/plan/spi/CollectionReference.java M hibernate-core/src/main/java/org/hibernate/persister/walking/internal/CompositionSingularSubAttributesHelper.java M hibernate-core/src/main/java/org/hibernate/persister/walking/spi/MetamodelGraphWalker.java A hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Currency.java A hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/ExchangeOffice.java A hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/ExchangeRate.java A hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/ExchangeRateKey.java M hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java Log Message: ----------- HHH-8879 HHH-8994 : Embeddable with associations used as a Map key (cherry picked from commit 64c3e4c783cbc1b836fab5365d58829cd4797df3) Conflicts: hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java