diff --git a/core/src/main/java/org/hibernate/loader/BasicLoader.java b/core/src/main/java/org/hibernate/loader/BasicLoader.java index 2d196046f6..f35550b31a 100644 --- a/core/src/main/java/org/hibernate/loader/BasicLoader.java +++ b/core/src/main/java/org/hibernate/loader/BasicLoader.java @@ -24,8 +24,8 @@ */ package org.hibernate.loader; -import java.util.Set; -import java.util.HashSet; +import java.util.List; +import java.util.ArrayList; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.persister.entity.Loadable; @@ -70,14 +70,14 @@ public abstract class BasicLoader extends Loader { } CollectionPersister[] collectionPersisters = getCollectionPersisters(); - Set bagRoles = null; + List bagRoles = null; if ( collectionPersisters != null ) { String[] collectionSuffixes = getCollectionSuffixes(); collectionDescriptors = new CollectionAliases[collectionPersisters.length]; for ( int i = 0; i < collectionPersisters.length; i++ ) { if ( isBag( collectionPersisters[i] ) ) { if ( bagRoles == null ) { - bagRoles = new HashSet(); + bagRoles = new ArrayList(); } bagRoles.add( collectionPersisters[i].getRole() ); } diff --git a/core/src/main/java/org/hibernate/loader/MultipleBagFetchException.java b/core/src/main/java/org/hibernate/loader/MultipleBagFetchException.java index ba191a7215..8b3e6b5faf 100644 --- a/core/src/main/java/org/hibernate/loader/MultipleBagFetchException.java +++ b/core/src/main/java/org/hibernate/loader/MultipleBagFetchException.java @@ -23,7 +23,7 @@ */ package org.hibernate.loader; -import java.util.Set; +import java.util.List; import org.hibernate.HibernateException; @@ -34,19 +34,19 @@ import org.hibernate.HibernateException; * @author Steve Ebersole */ public class MultipleBagFetchException extends HibernateException { - private final Set bagRoles; + private final List bagRoles; - public MultipleBagFetchException(Set bagRoles) { + public MultipleBagFetchException(List bagRoles) { super( "cannot simultaneously fetch multiple bags" ); this.bagRoles = bagRoles; } /** - * Retrieves the set of collection roles for the bags encountered. + * Retrieves the collection-roles for the bags encountered. * * @return The bag collection roles. */ - public Set getBagRoles() { + public List getBagRoles() { return bagRoles; } }