HHH-9568 : EntityManager.flush() does not behave properly with transi…

…ent one-to-one association and no cascade (reverts HHH-9330) (cherry picked from commit d933c78)
hibernate · Jan 14, 2015 · e4715cc · e4715cc
1 parent 62bfc27
commit e4715cc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyles.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyles.java
@@ -205,9 +205,7 @@ public String toString() {
 	public static final CascadeStyle DELETE_ORPHAN = new BaseCascadeStyle() {
 		@Override
 		public boolean doCascade(CascadingAction action) {
-			return action == CascadingActions.DELETE ||
-					action == CascadingActions.SAVE_UPDATE ||
-					action == CascadingActions.PERSIST_ON_FLUSH;
+			return action == CascadingActions.DELETE || action == CascadingActions.SAVE_UPDATE;
 		}
 
 		@Override

diff --git a/...ger/src/test/java/org/hibernate/jpa/test/orphan/onetomany/DeleteOneToManyOrphansTest.java b/...ger/src/test/java/org/hibernate/jpa/test/orphan/onetomany/DeleteOneToManyOrphansTest.java
@@ -30,6 +30,7 @@
 import org.junit.Test;
 
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.TestForIssue;
 
 import static org.junit.Assert.assertEquals;
@@ -67,7 +68,8 @@ private void cleanupData() {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-9330")
+	@TestForIssue( jiraKey = "HHH-9568")
+	@FailureExpected( jiraKey = "HHH-9568" )
 	public void testOrphanedWhileManaged() {
 		createData();
 
@@ -100,7 +102,8 @@ public void testOrphanedWhileManaged() {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-9330")
+	@TestForIssue( jiraKey = "HHH-9568")
+	@FailureExpected( jiraKey = "HHH-9568" )
 	public void testOrphanedWhileManagedMergeOwner() {
 		createData();
 
@@ -134,7 +137,8 @@ public void testOrphanedWhileManagedMergeOwner() {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-9330")
+	@TestForIssue( jiraKey = "HHH-9568")
+	@FailureExpected( jiraKey = "HHH-9568" )
 	public void testReplacedWhileManaged() {
 		createData();
 

diff --git a/...ntitymanager/src/test/java/org/hibernate/jpa/test/orphan/onetoone/OneToOneOrphanTest.java b/...ntitymanager/src/test/java/org/hibernate/jpa/test/orphan/onetoone/OneToOneOrphanTest.java
@@ -49,7 +49,6 @@ public Class[] getAnnotatedClasses() {
 
 	@Test
 	@TestForIssue(jiraKey = "HHH-9568")
-	@FailureExpected(jiraKey = "HHH-9568")
 	public void testFlushTransientOneToOneNoCascade() throws Exception {
 		EntityManager em = getOrCreateEntityManager();
 		em.getTransaction().begin();