Branch: refs/heads/4.3 Home: https://github.com/hibernate/hibernate-orm Commit: 7a247e114e8c9e712106e3cfc264b8c46a25438c https://github.com/hibernate/hibernate-orm/commit/7a247e114e8c9e712106e3c... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2015-03-12 (Thu, 12 Mar 2015) Changed paths: M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java A hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/cid/A.java A hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/cid/AId.java A hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java A hibernate-core/src/test/java/org/hibernate/test/naturalid/cid/Account.hbm.xml A hibernate-core/src/test/java/org/hibernate/test/naturalid/cid/Account.java A hibernate-core/src/test/java/org/hibernate/test/naturalid/cid/AccountId.java A hibernate-core/src/test/java/org/hibernate/test/naturalid/cid/CompositeIdAndNaturalIdTest.java Log Message: ----------- HHH-9333 : TypeMismatchException when using composite-id and natural-id mappings (cherry picked from commit 965e044850f26e06455ac1eaf1ec385684b811cc)