[Hibernate-commits] Hibernate/cirrus/hibernate/loader CollectionInitializer.java,1.3,1.4 CollectionLoader.java,1.6,1.7 EntityLoader.java,1.9,1.10 OneToManyLoader.java,1.10,1.11 SimpleEntityLoader.java,1.4,1.5 UniqueEntityLoader.java,1.2,1.3

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader
In directory usw-pr-cvs1:/tmp/cvs-serv4847/hibernate/loader

Modified Files:
	CollectionInitializer.java CollectionLoader.java 
	EntityLoader.java OneToManyLoader.java SimpleEntityLoader.java 
	UniqueEntityLoader.java 
Log Message:
fixed minor problem with proxies for classes that override finalize

Index: CollectionInitializer.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/CollectionInitializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CollectionInitializer.java	1 Oct 2002 01:25:30 -0000	1.3
--- CollectionInitializer.java	5 Nov 2002 06:46:06 -0000	1.4
***************
*** 15,18 ****
--- 15,21 ----
   */
  public interface CollectionInitializer {
+ 	/**
+ 	 * Initialize the given collection
+ 	 */
  	public void initialize(Serializable id, PersistentCollection collection, SessionImplementor session) throws SQLException, HibernateException;
  }

Index: CollectionLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/CollectionLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CollectionLoader.java	21 Oct 2002 18:21:10 -0000	1.6
--- CollectionLoader.java	5 Nov 2002 06:46:06 -0000	1.7
***************
*** 15,18 ****
--- 15,21 ----
  import cirrus.hibernate.type.Type;
  
+ /**
+  * Loads a collection of values or a many-to-many association
+  */
  public class CollectionLoader extends OuterJoinLoader implements CollectionInitializer {
  	

Index: EntityLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/EntityLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EntityLoader.java	5 Nov 2002 03:44:01 -0000	1.9
--- EntityLoader.java	5 Nov 2002 06:46:06 -0000	1.10
***************
*** 15,18 ****
--- 15,21 ----
  import cirrus.hibernate.type.Type;
  
+ /**
+  * Load an entity using outerjoin fetching to fetch associated entities.
+  */
  public class EntityLoader extends OuterJoinLoader implements UniqueEntityLoader {
  	

Index: OneToManyLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/OneToManyLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** OneToManyLoader.java	4 Nov 2002 08:10:49 -0000	1.10
--- OneToManyLoader.java	5 Nov 2002 06:46:06 -0000	1.11
***************
*** 16,19 ****
--- 16,22 ----
  import cirrus.hibernate.type.Type;
  
+ /**
+  * Loads one-to-many associations
+  */
  public class OneToManyLoader extends OuterJoinLoader implements CollectionInitializer {
  	

Index: SimpleEntityLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/SimpleEntityLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimpleEntityLoader.java	2 Oct 2002 06:27:55 -0000	1.4
--- SimpleEntityLoader.java	5 Nov 2002 06:46:06 -0000	1.5
***************
*** 14,18 ****
  
  /**
!  * Loads entity instances one instance per select
   */
  public final class SimpleEntityLoader extends Loader implements UniqueEntityLoader {
--- 14,18 ----
  
  /**
!  * Loads entity instances one instance per select (ie. without outerjoin fetching)
   */
  public final class SimpleEntityLoader extends Loader implements UniqueEntityLoader {
***************
*** 50,54 ****
  		return lockMode;
  	}
! 
  	public Object load(SessionImplementor session, Serializable id, Object object) throws HibernateException, SQLException {
  		List list = loadEntity(session, new Object[] { id }, idType, object, id, false);
--- 50,54 ----
  		return lockMode;
  	}
! 	
  	public Object load(SessionImplementor session, Serializable id, Object object) throws HibernateException, SQLException {
  		List list = loadEntity(session, new Object[] { id }, idType, object, id, false);

Index: UniqueEntityLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/UniqueEntityLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UniqueEntityLoader.java	1 Oct 2002 01:25:30 -0000	1.2
--- UniqueEntityLoader.java	5 Nov 2002 06:46:06 -0000	1.3
***************
*** 9,12 ****
--- 9,16 ----
  
  public interface UniqueEntityLoader {
+ 	/**
+ 	 * Load an entity instance. If <tt>optionalObject</tt> is supplied,
+ 	 * load the entity state into the given (uninitialized) object.
+ 	 */
  	public Object load(SessionImplementor session, Serializable id, Object optionalObject) throws HibernateException, SQLException;
  }