Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: 527bca144f9810ab6bdb1f43dcbd00af286374d1 https://github.com/hibernate/hibernate-orm/commit/527bca144f9810ab6bdb1f4... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-10-11 (Fri, 11 Oct 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java A hibernate-core/src/main/java/org/hibernate/action/internal/OrphanRemovalAction.java M hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java M hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java M hibernate-core/src/main/java/org/hibernate/event/spi/DeleteEvent.java M hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java M hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java M hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java M hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java M hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java M hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java Log Message: ----------- HHH-6484 remove orphaned one-to-one when association replaced while managed Conflicts: hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java