[Hibernate-commits] Hibernate2/src/net/sf/hibernate/impl SessionImpl.java,1.37,1.38

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

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

Modified Files:
	SessionImpl.java 
Log Message:
* renamed remove() to evict()

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/SessionImpl.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** SessionImpl.java	21 Apr 2003 06:28:18 -0000	1.37
--- SessionImpl.java	21 Apr 2003 06:34:46 -0000	1.38
***************
*** 3027,3031 ****
  				if (entity!=null) {
  					removeEntry(entity);
! 					evictCollections(persister, entity);
  				}
  			}			
--- 3027,3031 ----
  				if (entity!=null) {
  					removeEntry(entity);
! 					doEvict(persister, entity);
  				}
  			}			
***************
*** 3035,3050 ****
  			if (e!=null) {
  				removeEntity( new Key(e.id, e.persister) );
! 				evictCollections(e.persister, object);
  			}
  		}
  	}
  	
! 	private void evictCollections(ClassPersister persister, Object object) throws HibernateException {
  		
! 		if ( log.isTraceEnabled() ) log.trace( "removing from session cache " + MessageHelper.infoString(persister) );
  		
  		//remove all collections for the entity
  		evictCollections( persister.getPropertyValues(object), persister.getPropertyTypes() );
! 		Cascades.cascade(this, persister, object, Cascades.ACTION_REMOVE, Cascades.CASCADE_ON_REMOVE);
  	}
  	
--- 3035,3050 ----
  			if (e!=null) {
  				removeEntity( new Key(e.id, e.persister) );
! 				doEvict(e.persister, object);
  			}
  		}
  	}
  	
! 	private void doEvict(ClassPersister persister, Object object) throws HibernateException {
  		
! 		if ( log.isTraceEnabled() ) log.trace( "evicting " + MessageHelper.infoString(persister) );
  		
  		//remove all collections for the entity
  		evictCollections( persister.getPropertyValues(object), persister.getPropertyTypes() );
! 		Cascades.cascade(this, persister, object, Cascades.ACTION_EVICT, Cascades.CASCADE_ON_EVICT);
  	}