Branch: refs/heads/4.1
Home:
https://github.com/hibernate/hibernate-orm
Commit: ae3555221c69284903825a4a17f759de0aadaa67
https://github.com/hibernate/hibernate-orm/commit/ae3555221c69284903825a4...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java
M hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
A
hibernate-core/src/test/java/org/hibernate/test/event/collection/detached/AggregatedCollectionEventListener.java
A
hibernate-core/src/test/java/org/hibernate/test/event/collection/detached/Alias.java
A
hibernate-core/src/test/java/org/hibernate/test/event/collection/detached/BadMergeHandlingTest.java
A
hibernate-core/src/test/java/org/hibernate/test/event/collection/detached/Character.java
A
hibernate-core/src/test/java/org/hibernate/test/event/collection/detached/Identifiable.java
A
hibernate-core/src/test/java/org/hibernate/test/event/collection/detached/MergeCollectionEventTest.java
M
hibernate-core/src/test/java/org/hibernate/test/event/collection/detached/MultipleCollectionListeners.java
Log Message:
-----------
HHH-7928 - Regression caused by HHH-6361
(cherry picked from commit cb1b9a05af20713a7d673c0a4fa0536a6a4792c1)
Conflicts:
hibernate-core/src/test/java/org/hibernate/test/event/collection/detached/BadMergeHandlingTest.java