Branch: refs/heads/5.1 Home: https://github.com/hibernate/hibernate-orm Commit: e25fcd2ed72f83a916cb9f094ea620d065100e76 https://github.com/hibernate/hibernate-orm/commit/e25fcd2ed72f83a916cb9f0... Author: Alex Belyaev <alex.bel.izh(a)gmail.com&gt; Date: 2016-08-29 (Mon, 29 Aug 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java M hibernate-core/src/main/java/org/hibernate/type/EntityType.java A hibernate-core/src/test/java/org/hibernate/test/cascade/circle/CascadeManagedAndTransient.hbm.xml A hibernate-core/src/test/java/org/hibernate/test/cascade/circle/CascadeManagedAndTransientTest.java Log Message: ----------- HHH-9512: Avoid creation of invalid managed -> managed entity mapping in MergeContext when traversing cascade loop (cherry picked from commit 816c97613deb4bd6b1074d339cb1f2a859e630d9)