[hibernate-commits] [hibernate/hibernate-orm] 61f548: HHH-7928 - Regression caused by HHH-6361

Branch: refs/heads/4.1-perf Home: https://github.com/hibernate/hibernate-orm Commit: 61f548db6ff26545af7d80c893243a01ccd50b0e https://github.com/hibernate/hibernate-orm/commit/61f548db6ff26545af7d80c... Author: Steve Ebersole <steve(a)hibernate.org&gt; 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 M 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