Branch: refs/heads/5.0 Home: https://github.com/hibernate/hibernate-orm Commit: 43134abdd02e15491f80e3a96de78f9c502088d4 https://github.com/hibernate/hibernate-orm/commit/43134abdd02e15491f80e3a... Author: johara <johnaohara80(a)gmail.com&gt; Date: 2016-07-26 (Tue, 26 Jul 2016) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionNoTransactionLoadingTestTask.java Log Message: ----------- HHH-10993 - Added testcase for Lazy Loaded collections outside transaction in bytecode enhanced entities Conflicts: hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java Commit: f8243a60073fb5622a27f56147f7db3ad5975b79 https://github.com/hibernate/hibernate-orm/commit/f8243a60073fb5622a27f56... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2016-07-26 (Tue, 26 Jul 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractEntityEntry.java Log Message: ----------- HHH-10993 : NPE when Lazy loading collection without transaction for bytecode enhanced entitie (cherry picked from commit 2c553f3290f01c6eeb3e2b75d89428e9b99712e3) Compare: https://github.com/hibernate/hibernate-orm/compare/d66c213b6140...f8243a6...