[hibernate-commits] [hibernate/hibernate-orm] 767891: Merge branch 'HHH-7097' of https://github.com/edal...

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: 7678917313b12c84aad8464466b2485b018e486f https://github.com/hibernate/hibernate-orm/commit/7678917313b12c84aad8464... Author: Steve Ebersole <steve(a)apollo.(none)&gt; Date: 2012-03-01 (Thu, 01 Mar 2012) Changed paths: M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java M hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java M hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java M hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java Log Message: ----------- Merge branch 'HHH-7097' of https://github.com/edalquist/hibernate-core Commit: a889b6cca125f87efd6cf7c85507e6356a02c818 https://github.com/hibernate/hibernate-orm/commit/a889b6cca125f87efd6cf7c... Author: Steve Ebersole <steve(a)apollo.(none)&gt; Date: 2012-03-01 (Thu, 01 Mar 2012) Changed paths: M hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdXrefDelegate.java M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java M hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java M hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java M hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java M hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java Log Message: ----------- HHH-7097 - Entity load event doesn't result in naturalId->pk caching Compare: https://github.com/hibernate/hibernate-orm/compare/9bbcf5a...a889b6c