Revert "HHH-9777 : Dereferenced collections are not processed properly"

This reverts commit 9466446.
hibernate · Jun 17, 2015 · 4d22b54 · 4d22b54
1 parent f36e0ef
commit 4d22b54
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 5 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
@@ -313,7 +313,7 @@ public boolean isDirty(Object old, Object current, SessionImplementor session)
 
 		// TODO: I don't really like this implementation; it would be better if
 		// this was handled by searchForDirtyCollections()
-		return super.isDirty( old, current, session );
+		return isOwnerVersioned( session ) && super.isDirty( old, current, session );
 		// return false;
 
 	}

diff --git a/...t/java/org/hibernate/test/collection/dereferenced/AbstractDereferencedCollectionTest.java b/...t/java/org/hibernate/test/collection/dereferenced/AbstractDereferencedCollectionTest.java
@@ -31,7 +31,6 @@
 import org.hibernate.engine.spi.CollectionEntry;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
 import java.lang.InstantiationException;
@@ -49,7 +48,6 @@
 public abstract class AbstractDereferencedCollectionTest extends BaseCoreFunctionalTestCase {
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-9777" )
 	public void testMergeNullCollection() {
 		Session s = openSession();
 		s.getTransaction().begin();
@@ -123,7 +121,6 @@ public void testMergeNullCollection() {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-9777" )
 	public void testGetAndNullifyCollection() {
 		Session s = openSession();
 		s.getTransaction().begin();
@@ -199,7 +196,7 @@ public void testGetAndNullifyCollection() {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-9777" )
+	//@FailureExpected( jiraKey = "HHH-9777")
 	public void testGetAndReplaceCollection() {
 		Session s = openSession();
 		s.getTransaction().begin();

diff --git a/.../hibernate/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java b/.../hibernate/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java
@@ -23,6 +23,10 @@
  */
 package org.hibernate.test.collection.dereferenced;
 
+import org.junit.Test;
+
+import org.hibernate.testing.FailureExpected;
+
 /**
  * @author Gail Badner
  */
@@ -32,4 +36,25 @@ public class UnversionedCascadeDereferencedCollectionTest extends AbstractDerefe
 	protected Class<?> getCollectionOwnerClass() {
 		return UnversionedCascadeOne.class;
 	}
+
+	@Override
+	@Test
+	@FailureExpected(jiraKey = "HHH-9777")
+	public void testMergeNullCollection() {
+		super.testMergeNullCollection();
+	}
+
+	@Override
+	@Test
+	@FailureExpected(jiraKey = "HHH-9777")
+	public void testGetAndNullifyCollection() {
+		super.testGetAndNullifyCollection();
+	}
+
+	@Override
+	@Test
+	@FailureExpected(jiraKey = "HHH-9777")
+	public void testGetAndReplaceCollection() {
+		super.testGetAndReplaceCollection();
+	}
 }
diff --git a/...ibernate/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java b/...ibernate/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java
@@ -36,4 +36,25 @@ public class UnversionedNoCascadeDereferencedCollectionTest extends AbstractDere
 	protected Class<?> getCollectionOwnerClass() {
 		return UnversionedNoCascadeOne.class;
 	}
+
+	@Override
+	@Test
+	@FailureExpected(jiraKey = "HHH-9777")
+	public void testMergeNullCollection() {
+		super.testMergeNullCollection();
+	}
+
+	@Override
+	@Test
+	@FailureExpected(jiraKey = "HHH-9777")
+	public void testGetAndNullifyCollection() {
+		super.testGetAndNullifyCollection();
+	}
+
+	@Override
+	@Test
+	@FailureExpected(jiraKey = "HHH-9777")
+	public void testGetAndReplaceCollection() {
+		super.testGetAndReplaceCollection();
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java
@@ -130,6 +130,7 @@ public String[] getMappings() {
 	}
 
 	@Test
+	@FailureExpected(jiraKey = "HHH-9777")
 	public void testSaveOrUpdateCopyAny() throws Exception {
 		Session s = openSession();
 		s.beginTransaction();