Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: db475ed716045b4c2a7eebccfbf51daf7e2a3c6e https://github.com/hibernate/hibernate-orm/commit/db475ed716045b4c2a7eebc... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2015-06-11 (Thu, 11 Jun 2015) Changed paths: M hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java A hibernate-core/src/test/java/org/hibernate/test/collection/multisession/MultipleSessionCollectionTest.java Log Message: ----------- HHH-9518 : Exception handling around collection session access needs to be improved (cherry picked from commit f4f04901e266f00451ec13b86b90eeefb803d7a5) Conflicts: hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java HHH-9518 : Corrections to test to work for pre-5.0 (cherry picked from commit 0854a0473f444dce4c9241a87e7c4542e690451f) Conflicts: hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java