Branch: refs/heads/4.1 Home: https://github.com/hibernate/hibernate-orm Commit: d33d481b522abde075b477be6f7c818a7f02c455 https://github.com/hibernate/hibernate-orm/commit/d33d481b522abde075b477b... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2012-08-23 (Thu, 23 Aug 2012) Changed paths: M hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java A hibernate-core/src/test/java/org/hibernate/test/collectionalias/ATable.java A hibernate-core/src/test/java/org/hibernate/test/collectionalias/CollectionAliasTest.java A hibernate-core/src/test/java/org/hibernate/test/collectionalias/ReorderedMappingsCollectionAliasTest.java A hibernate-core/src/test/java/org/hibernate/test/collectionalias/TableA.java A hibernate-core/src/test/java/org/hibernate/test/collectionalias/TableB.java A hibernate-core/src/test/java/org/hibernate/test/collectionalias/TableBId.java Log Message: ----------- HHH-7545 : Aliases for a collection key and element column can collide causing one to be excluded (cherry picked from commit 5327ac5396dd742907fb0c01b6d9a9faa6314c8b)