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

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

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

Modified Files:
	SessionImpl.java 
Log Message:
update() support for embedded composite ids

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/SessionImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SessionImpl.java	22 Jan 2003 13:09:19 -0000	1.11
--- SessionImpl.java	22 Jan 2003 13:35:18 -0000	1.12
***************
*** 952,956 ****
  	}
  	
- 	//deprecated:
  	public void update(Object obj) throws HibernateException {
  		
--- 952,955 ----
***************
*** 960,964 ****
  		
  		ClassPersister persister = getPersister(object);
! 		if ( persister.hasIdentifierProperty() ) {
  			
  			if ( isEntryFor(object) ) {
--- 959,963 ----
  		
  		ClassPersister persister = getPersister(object);
! 		//if ( persister.hasIdentifierProperty() ) {
  			
  			if ( isEntryFor(object) ) {
***************
*** 972,976 ****
  				if (id==null) {
  					// assume this is a newly instantiated transient object
! 					throw new HibernateException("The given object has a null identifier property " + infoString(persister));
  				}
  				else {
--- 971,977 ----
  				if (id==null) {
  					// assume this is a newly instantiated transient object
! 					throw new HibernateException(
! 						"The given object has a null identifier property " + infoString(persister)
! 					);
  				}
  				else {
***************
*** 980,987 ****
  			}
  			
! 		}
  		else {
  			throw new HibernateException("The given object has no identifier property - you must supply an id " + infoString(persister));
! 		}
  		
  	}
--- 981,988 ----
  			}
  			
! 		/*}
  		else {
  			throw new HibernateException("The given object has no identifier property - you must supply an id " + infoString(persister));
! 		}*/
  		
  	}