[Hibernate-commits] Hibernate/cirrus/hibernate/impl SessionImpl.java,1.160,1.161

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv10537/cirrus/hibernate/impl

Modified Files:
	SessionImpl.java 
Log Message:
1.2.2

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl/SessionImpl.java,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** SessionImpl.java	28 Dec 2002 02:25:49 -0000	1.160
--- SessionImpl.java	4 Jan 2003 13:05:14 -0000	1.161
***************
*** 702,705 ****
--- 702,707 ----
  			Serializable id = persister.getIdentifier(object);
  
+ 			if (id==null) throw new HibernateException("the transient instance passed to delete() had a null identifier");
+ 
  			removeCollectionsFor(persister, id, object);
  
***************
*** 1219,1223 ****
  		setFlushMode(FlushMode.AUTO);
  	}
! 	
  	public void setFlushMode(FlushMode flushMode) {
  		this.flushMode = flushMode;
--- 1221,1225 ----
  		setFlushMode(FlushMode.AUTO);
  	}
! 
  	public void setFlushMode(FlushMode flushMode) {
  		this.flushMode = flushMode;
***************
*** 1342,1347 ****
  		Object version = Versioning.getVersion(values, persister);
  		addEntry(object, LOADED, values, id, version, lockMode, true, persister);
! 		
! 		if ( log.isTraceEnabled() && version!=null ) log.trace("Version: " + version);		
  	}
  
--- 1344,1349 ----
  		Object version = Versioning.getVersion(values, persister);
  		addEntry(object, LOADED, values, id, version, lockMode, true, persister);
! 
! 		if ( log.isTraceEnabled() && version!=null ) log.trace("Version: " + version);
  	}
  
***************
*** 2042,2046 ****
  		if ( log.isDebugEnabled() ) {
  			log.debug(
! 				"Collection found: " + infoString(persister, ce.currentID) + 
  				", was: " + infoString(ce.loadedPersister, ce.loadedID)
  			);
--- 2044,2048 ----
  		if ( log.isDebugEnabled() ) {
  			log.debug(
! 				"Collection found: " + infoString(persister, ce.currentID) +
  				", was: " + infoString(ce.loadedPersister, ce.loadedID)
  			);
***************
*** 2249,2262 ****
  		// if the collection contains other collections, and it has been (lazily) initialized,
  		// check if _they_ are dirty
! 		
  		Type eltType = persister.getElementType();
! 		
  		if ( eltType.isPersistentCollectionType() || eltType.isComponentType() ) { //optional performance opt
! 		
  			Iterator iter = coll.elements();
  			while ( iter.hasNext() ) {
  				if ( searchForDirtyCollections( iter.next(), eltType ) ) return true;
  			}
! 		
  		}
  
--- 2251,2264 ----
  		// if the collection contains other collections, and it has been (lazily) initialized,
  		// check if _they_ are dirty
! 
  		Type eltType = persister.getElementType();
! 
  		if ( eltType.isPersistentCollectionType() || eltType.isComponentType() ) { //optional performance opt
! 
  			Iterator iter = coll.elements();
  			while ( iter.hasNext() ) {
  				if ( searchForDirtyCollections( iter.next(), eltType ) ) return true;
  			}
! 
  		}
  
***************
*** 2338,2342 ****
  		return getCollectionEntry(coll).loadedID;
  	}
! 	
  	public boolean isCollectionReadOnly(PersistentCollection collection) {
  		CollectionEntry ce = getCollectionEntry(collection);
--- 2340,2344 ----
  		return getCollectionEntry(coll).loadedID;
  	}
! 
  	public boolean isCollectionReadOnly(PersistentCollection collection) {
  		CollectionEntry ce = getCollectionEntry(collection);
***************
*** 2591,2595 ****
          if(persister==null) {
             s.append("<null ClassPersister>");
!         } 
          else {
            s.append(persister.getClassName());
--- 2593,2597 ----
          if(persister==null) {
             s.append("<null ClassPersister>");
!         }
          else {
            s.append(persister.getClassName());
***************
*** 2599,2603 ****
          if (id==null) {
                 s.append("<null>");
!         } 
          else {
              s.append(id);
--- 2601,2605 ----
          if (id==null) {
                 s.append("<null>");
!         }
          else {
              s.append(id);
***************
*** 2608,2612 ****
  
      }
!     
      private static String infoString(Class clazz, Serializable id) {
          StringBuffer s = new StringBuffer();
--- 2610,2614 ----
  
      }
! 
      private static String infoString(Class clazz, Serializable id) {
          StringBuffer s = new StringBuffer();
***************
*** 2614,2618 ****
          if(clazz==null) {
              s.append("<null Class>");
!         } 
          else {
              s.append( clazz.getName() );
--- 2616,2620 ----
          if(clazz==null) {
              s.append("<null Class>");
!         }
          else {
              s.append( clazz.getName() );
***************
*** 2622,2626 ****
          if (id==null) {
              s.append("<null>");
!         } 
          else {
              s.append(id);
--- 2624,2628 ----
          if (id==null) {
              s.append("<null>");
!         }
          else {
              s.append(id);
***************
*** 2636,2640 ****
  		if (persister == null) {
  			s.append("<null ClassPersister>");
! 		} 
  		else {
  			s.append( persister.getClassName() );
--- 2638,2642 ----
  		if (persister == null) {
  			s.append("<null ClassPersister>");
! 		}
  		else {
  			s.append( persister.getClassName() );
***************
*** 2649,2660 ****
          if(persister==null) {
             s.append("<unreferenced>");
!         } 
          else {
  	        s.append( persister.getRole() );
  	        s.append('#');
! 	
  	        if (id==null) {
  	            s.append("<null>");
! 	        } 
  	        else {
  	            s.append(id);
--- 2651,2662 ----
          if(persister==null) {
             s.append("<unreferenced>");
!         }
          else {
  	        s.append( persister.getRole() );
  	        s.append('#');
! 
  	        if (id==null) {
  	            s.append("<null>");
! 	        }
  	        else {
  	            s.append(id);