[Hibernate-commits] Hibernate/cirrus/hibernate/persister MultiTableEntityPersister.java,1.30,1.31

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

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

Modified Files:
	MultiTableEntityPersister.java 
Log Message:
load(id, lockMode) now working for MultiTableEntityPersister
some new tests

Index: MultiTableEntityPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister/MultiTableEntityPersister.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** MultiTableEntityPersister.java	18 Nov 2002 11:43:30 -0000	1.30
--- MultiTableEntityPersister.java	20 Nov 2002 10:30:45 -0000	1.31
***************
*** 8,12 ****
  import cirrus.hibernate.id.NativeGenerator;
  import cirrus.hibernate.loader.EntityLoader;
- import cirrus.hibernate.loader.SimpleEntityLoader;
  import cirrus.hibernate.loader.UniqueEntityLoader;
  import cirrus.hibernate.map.Column;
--- 8,11 ----
***************
*** 115,119 ****
  	private transient final String discriminatorSQLString;
  	
! 	protected transient final Map loaders = new HashMap();
  	protected transient final Map lockers = new HashMap();
  	
--- 114,119 ----
  	private transient final String discriminatorSQLString;
  	
! 	protected transient UniqueEntityLoader loader;
! 	//protected transient final Map loaders = new HashMap();
  	protected transient final Map lockers = new HashMap();
  	
***************
*** 154,181 ****
  		
  	
! 		UniqueEntityLoader loader = //new SimpleEntityLoader(this, generateSelectString(), LockMode.READ);
  			new EntityLoader(this, factory);
  		
- 		loaders.put( LockMode.NONE, loader );
- 		loaders.put( LockMode.READ, loader );
- 		
- 		String selectForUpdate = factory.getDialect().supportsForUpdate() ? 
- 			generateSelectForUpdateString() : 
- 			generateSelectString();
- 
- 		loaders.put( 
- 			LockMode.UPGRADE, 
- 			new SimpleEntityLoader( this, selectForUpdate, LockMode.UPGRADE )
- 		);
- 
- 		String selectForUpdateNowait = factory.getDialect().supportsForUpdateNowait() ?
- 			generateSelectForUpdateNowaitString() :
- 			selectForUpdate;
- 		
- 		loaders.put( 
- 			LockMode.UPGRADE_NOWAIT,
- 			new SimpleEntityLoader( this, selectForUpdateNowait, LockMode.UPGRADE_NOWAIT )
- 		);
- 
  	}
  	
--- 154,160 ----
  		
  	
! 		loader = //new SimpleEntityLoader(this, generateSelectString(), LockMode.READ);
  			new EntityLoader(this, factory);
  		
  	}
  	
***************
*** 567,571 ****
  		if ( log.isTraceEnabled() ) log.trace( "Materializing entity: " + getClassName() + '#' + id );
  		
! 		return ( (UniqueEntityLoader) loaders.get(lockMode) ).load(session, id, optionalObject);
  	}
  
--- 546,554 ----
  		if ( log.isTraceEnabled() ) log.trace( "Materializing entity: " + getClassName() + '#' + id );
  		
! 		Object result = loader.load(session, id, optionalObject);
! 		
! 		lock(id, getVersion(result), result, lockMode, session);
! 		
! 		return result;
  	}