HHH-11965 - Fix cascade of one-to-one associations with proxies.

hibernate · Sep 29, 2017 · 00492a3 · 00492a3
1 parent 5a49cdc
commit 00492a3
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java
@@ -285,6 +285,15 @@ private static void cascadeLogicalOneToOneOrphanRemoval(
 							// useful for @OneToOne defined as FetchType.LAZY
 							loadedValue = eventSource.getPersistenceContext().unproxyAndReassociate( loadedValue );
 							valueEntry = eventSource.getPersistenceContext().getEntry( loadedValue );
+
+							// HHH-11965
+							// Should the unwrapped proxy value be equal via reference to the entity's property value
+							// provided by the 'child' variable, we should not trigger the orphan removal of the
+							// associated one-to-one.
+							if ( child == loadedValue ) {
+								// do nothing
+								return;
+							}
 						}
 
 						if ( valueEntry != null ) {