[Hibernate-commits] Hibernate Code SVN: r9889 - in trunk/Hibernate3/src/org/hibernate/loader: . entity

[<hib...@li...>]

Author: ste...@jb...
Date: 2006-05-04 21:24:12 -0400 (Thu, 04 May 2006)
New Revision: 9889

Modified:
   trunk/Hibernate3/src/org/hibernate/loader/JoinWalker.java
   trunk/Hibernate3/src/org/hibernate/loader/entity/CascadeEntityJoinWalker.java
Log:
fixed small bug in disallowing multiple bag fetches

Modified: trunk/Hibernate3/src/org/hibernate/loader/JoinWalker.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/loader/JoinWalker.java	2006-05-05 01:04:16 UTC (rev 9888)
+++ trunk/Hibernate3/src/org/hibernate/loader/JoinWalker.java	2006-05-05 01:24:12 UTC (rev 9889)
@@ -565,7 +565,7 @@
 		
 		if  ( !isJoinedFetchEnabled(type, config, cascadeStyle) ) return -1;
 		
-		if ( isTooDeep(currentDepth) || isTooManyCollections() ) return -1;
+		if ( isTooDeep(currentDepth) || ( type.isCollectionType() && isTooManyCollections() ) ) return -1;
 		
 		final boolean dupe = isDuplicateAssociation(lhsTable,  lhsColumns, type);
 		if (dupe) return -1;

Modified: trunk/Hibernate3/src/org/hibernate/loader/entity/CascadeEntityJoinWalker.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/loader/entity/CascadeEntityJoinWalker.java	2006-05-05 01:04:16 UTC (rev 9888)
+++ trunk/Hibernate3/src/org/hibernate/loader/entity/CascadeEntityJoinWalker.java	2006-05-05 01:24:12 UTC (rev 9889)
@@ -33,7 +33,7 @@
 	}
 
 	protected boolean isTooManyCollections() {
-		return countCollectionPersisters(associations)>1;
+		return countCollectionPersisters(associations)>0;
 	}
 
 	public String getComment() {