[Hibernate-commits] Hibernate/cirrus/hibernate/impl SessionImpl.java,1.151,1.152

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

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

Modified Files:
	SessionImpl.java 
Log Message:
got tests working for firebird

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl/SessionImpl.java,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** SessionImpl.java	14 Nov 2002 11:28:55 -0000	1.151
--- SessionImpl.java	20 Nov 2002 14:20:08 -0000	1.152
***************
*** 1329,1333 ****
  	public void postHydrate(ClassPersister persister, Serializable id, Object[] values, Object object, LockMode lockMode) throws HibernateException {
  		persister.setIdentifier(object, id);
! 		addEntry(object, LOADED, values, id, Versioning.getVersion(values, persister), lockMode, true, persister);
  	}
  
--- 1329,1336 ----
  	public void postHydrate(ClassPersister persister, Serializable id, Object[] values, Object object, LockMode lockMode) throws HibernateException {
  		persister.setIdentifier(object, id);
! 		Object version = Versioning.getVersion(values, persister);
! 		addEntry(object, LOADED, values, id, version, lockMode, true, persister);
! 		
! 		if ( log.isTraceEnabled() && version!=null ) log.trace("Version: " + version);		
  	}
  
***************
*** 1520,1528 ****
  				addEntity( new Key(id, persister), finalResult );
  				Object[] values = entry.assemble(finalResult, id, subclassPersister, this); // intializes cached by side-effect
- 				//lock(finalResult, lockMode);
  				Type[] types = subclassPersister.getPropertyTypes();
- 				//Object[] values = subclassPersister.getPropertyValues(cached);
  				TypeFactory.deepCopy(values, types, values);
! 				addEntry(finalResult, LOADED, values, id, Versioning.getVersion(values, subclassPersister), LockMode.NONE, true, subclassPersister);
  				// upgrade the lock if necessary:
  				lock(finalResult, lockMode);
--- 1523,1531 ----
  				addEntity( new Key(id, persister), finalResult );
  				Object[] values = entry.assemble(finalResult, id, subclassPersister, this); // intializes cached by side-effect
  				Type[] types = subclassPersister.getPropertyTypes();
  				TypeFactory.deepCopy(values, types, values);
! 				Object version = Versioning.getVersion(values, subclassPersister);
! 				if ( log.isTraceEnabled() ) log.trace("Cached Version: " + version);
! 				addEntry(finalResult, LOADED, values, id, version, LockMode.NONE, true, subclassPersister);
  				// upgrade the lock if necessary:
  				lock(finalResult, lockMode);