[hibernate-commits] Hibernate SVN: r10589 - in trunk/Hibernate3: src/org/hibernate/collection test/org/hibernate/test/collection/set

[hibernate-commits at lists.jboss.org]

Author: max.andersen at jboss.com
Date: 2006-10-16 11:47:37 -0400 (Mon, 16 Oct 2006)
New Revision: 10589

Modified:
   trunk/Hibernate3/src/org/hibernate/collection/PersistentSet.java
   trunk/Hibernate3/test/org/hibernate/test/collection/set/PersistentSetTest.java
Log:
HHH-2145 set.retainAll calling set.addAll (with unittest)

Modified: trunk/Hibernate3/src/org/hibernate/collection/PersistentSet.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/collection/PersistentSet.java	2006-10-16 15:47:19 UTC (rev 10588)
+++ trunk/Hibernate3/src/org/hibernate/collection/PersistentSet.java	2006-10-16 15:47:37 UTC (rev 10589)
@@ -260,7 +260,7 @@
 	 */
 	public boolean retainAll(Collection coll) {
 		initialize( true );
-		if ( set.addAll( coll ) ) {
+		if ( set.retainAll( coll ) ) {
 			dirty();
 			return true;
 		}

Modified: trunk/Hibernate3/test/org/hibernate/test/collection/set/PersistentSetTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/collection/set/PersistentSetTest.java	2006-10-16 15:47:19 UTC (rev 10588)
+++ trunk/Hibernate3/test/org/hibernate/test/collection/set/PersistentSetTest.java	2006-10-16 15:47:37 UTC (rev 10589)
@@ -60,6 +60,10 @@
 		assertFalse( children.removeAll( otherSet ) );
 		assertFalse( children.isDirty() );
 
+		assertTrue( children.retainAll( otherSet ));
+		assertTrue( children.isDirty() );
+		assertTrue( children.isEmpty() );
+
 		children.clear();
 		session.delete( child );
 		assertTrue( children.isDirty() );