[Hibernate-commits] Hibernate2/src/net/sf/hibernate/loader CollectionLoader.java,1.4,1.5 EntityLoader.java,1.4,1.5 Loader.java,1.4,1.5 OneToManyLoader.java,1.4,1.5 OuterJoinLoader.java,1.5,1.6 SimpleEntityLoader.java,1.4,1.5

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader
In directory sc8-pr-cvs1:/tmp/cvs-serv9590/sf/hibernate/loader

Modified Files:
	CollectionLoader.java EntityLoader.java Loader.java 
	OneToManyLoader.java OuterJoinLoader.java 
	SimpleEntityLoader.java 
Log Message:
added a new exception to stop a flush occuring during cascade

Index: CollectionLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/CollectionLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CollectionLoader.java	5 Jan 2003 02:11:21 -0000	1.4
--- CollectionLoader.java	15 Jan 2003 12:49:01 -0000	1.5
***************
*** 12,16 ****
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
! import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.Type;
  
--- 12,16 ----
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
! import net.sf.hibernate.persister.Loadable;
  import net.sf.hibernate.type.Type;
  

Index: EntityLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/EntityLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EntityLoader.java	5 Jan 2003 02:11:21 -0000	1.4
--- EntityLoader.java	15 Jan 2003 12:49:01 -0000	1.5
***************
*** 11,16 ****
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
- import net.sf.hibernate.persister.*;
  import net.sf.hibernate.persister.ClassPersister;
  import net.sf.hibernate.type.Type;
  
--- 11,16 ----
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
  import net.sf.hibernate.persister.ClassPersister;
+ import net.sf.hibernate.persister.Loadable;
  import net.sf.hibernate.type.Type;
  

Index: Loader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/Loader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Loader.java	5 Jan 2003 02:11:21 -0000	1.4
--- Loader.java	15 Jan 2003 12:49:01 -0000	1.5
***************
*** 11,15 ****
  import java.util.Map;
  
! import org.apache.commons.logging.*;
  
  import net.sf.hibernate.Environment;
--- 11,16 ----
  import java.util.Map;
  
! import org.apache.commons.logging.Log;
! import org.apache.commons.logging.LogFactory;
  
  import net.sf.hibernate.Environment;
***************
*** 24,28 ****
  import net.sf.hibernate.util.JDBCExceptionReporter;
  import net.sf.hibernate.util.StringHelper;
! import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.Type;
  
--- 25,29 ----
  import net.sf.hibernate.util.JDBCExceptionReporter;
  import net.sf.hibernate.util.StringHelper;
! import net.sf.hibernate.persister.Loadable;
  import net.sf.hibernate.type.Type;
  

Index: OneToManyLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/OneToManyLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OneToManyLoader.java	5 Jan 2003 02:11:21 -0000	1.4
--- OneToManyLoader.java	15 Jan 2003 12:49:01 -0000	1.5
***************
*** 12,16 ****
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
! import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.EntityType;
  import net.sf.hibernate.type.Type;
--- 12,16 ----
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
! import net.sf.hibernate.persister.Loadable;
  import net.sf.hibernate.type.EntityType;
  import net.sf.hibernate.type.Type;

Index: OuterJoinLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/OuterJoinLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OuterJoinLoader.java	9 Jan 2003 12:24:51 -0000	1.5
--- OuterJoinLoader.java	15 Jan 2003 12:49:01 -0000	1.6
***************
*** 7,19 ****
  import java.util.Set;
  
- import net.sf.hibernate.engine.SessionFactoryImplementor;
- import net.sf.hibernate.util.ArrayHelper;
- import net.sf.hibernate.util.StringHelper;
- import net.sf.hibernate.persister.*;
- import net.sf.hibernate.type.*;
- 
  import net.sf.hibernate.MappingException;
  import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.dialect.Dialect;
  
  /**
--- 7,23 ----
  import java.util.Set;
  
  import net.sf.hibernate.MappingException;
  import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.dialect.Dialect;
+ import net.sf.hibernate.engine.SessionFactoryImplementor;
+ import net.sf.hibernate.persister.ClassPersister;
+ import net.sf.hibernate.persister.Loadable;
+ import net.sf.hibernate.persister.MultiTableEntityPersister;
+ import net.sf.hibernate.type.AbstractComponentType;
+ import net.sf.hibernate.type.EntityType;
+ import net.sf.hibernate.type.OneToOneType;
+ import net.sf.hibernate.type.Type;
+ import net.sf.hibernate.util.ArrayHelper;
+ import net.sf.hibernate.util.StringHelper;
  
  /**

Index: SimpleEntityLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/SimpleEntityLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimpleEntityLoader.java	5 Jan 2003 02:11:21 -0000	1.4
--- SimpleEntityLoader.java	15 Jan 2003 12:49:01 -0000	1.5
***************
*** 10,14 ****
  import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.engine.SessionImplementor;
! import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.Type;
  
--- 10,14 ----
  import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.engine.SessionImplementor;
! import net.sf.hibernate.persister.Loadable;
  import net.sf.hibernate.type.Type;