Branch: refs/heads/5.0
Home:
https://github.com/hibernate/hibernate-orm
Commit: cc94c57097df1ebf3944250741a3d4b43fa8581e
https://github.com/hibernate/hibernate-orm/commit/cc94c57097df1ebf3944250...
Author: Gail Badner <gbadner(a)redhat.com>
Date: 2016-07-14 (Thu, 14 Jul 2016)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/cfg/Ejb3Column.java
M hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
M hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
M
hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
A hibernate-core/src/test/java/org/hibernate/test/collection/map/LocalizedString.java
A
hibernate-core/src/test/java/org/hibernate/test/collection/map/MultilingualString.java
M
hibernate-core/src/test/java/org/hibernate/test/collection/map/PersistentMapTest.java
Log Message:
-----------
HHH-5393 : MappingException when @MapKeyColumn refers to a column mapped in embeddable
map value
(cherry picked from commit c893577efceff237f84d7200e1ef1a2895c95639)
Conflicts:
hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java