[Nhibernate-commit] nhibernate/src/NHibernate/Cache ICacheConcurrencyStrategy.cs,1.6,1.7 NonstrictReadWriteCache.cs,1.5,1.6 ReadOnlyCache.cs,1.9,1.10 ReadWriteCache.cs,1.8,1.9

[Paul H. <pha...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Cache
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21577/nhibernate/src/NHibernate/Cache

Modified Files:
	ICacheConcurrencyStrategy.cs NonstrictReadWriteCache.cs 
	ReadOnlyCache.cs ReadWriteCache.cs 
Log Message:
Refactored SessionImpl as per 2.1 for Save/Update

Index: ReadWriteCache.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cache/ReadWriteCache.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ReadWriteCache.cs	1 Mar 2005 16:24:43 -0000	1.8
--- ReadWriteCache.cs	6 Mar 2005 12:44:35 -0000	1.9
***************
*** 70,74 ****
  		/// </summary>
  		/// <param name="key"></param>
! 		public ISoftLock Lock( object key )
  		{
  			// TODO: Differs from the 2.1 implementation
--- 70,75 ----
  		/// </summary>
  		/// <param name="key"></param>
! 		/// <param name="version"></param>
! 		public ISoftLock Lock( object key, object version )
  		{
  			// TODO: Differs from the 2.1 implementation

Index: NonstrictReadWriteCache.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cache/NonstrictReadWriteCache.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NonstrictReadWriteCache.cs	1 Mar 2005 16:24:43 -0000	1.5
--- NonstrictReadWriteCache.cs	6 Mar 2005 12:44:35 -0000	1.6
***************
*** 93,97 ****
  		/// </summary>
  		/// <param name="key"></param>
! 		public ISoftLock Lock( object key )
  		{
  			// TODO: Differs from the 2.1 implemenation
--- 93,98 ----
  		/// </summary>
  		/// <param name="key"></param>
! 		/// <param name="version"></param>
! 		public ISoftLock Lock( object key, object version )
  		{
  			// TODO: Differs from the 2.1 implemenation

Index: ReadOnlyCache.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cache/ReadOnlyCache.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ReadOnlyCache.cs	1 Mar 2005 16:24:43 -0000	1.9
--- ReadOnlyCache.cs	6 Mar 2005 12:44:35 -0000	1.10
***************
*** 53,57 ****
  		/// </summary>
  		/// <param name="key"></param>
! 		public ISoftLock Lock( object key )
  		{
  			log.Error( "Application attempted to edit read only item: " + key );
--- 53,58 ----
  		/// </summary>
  		/// <param name="key"></param>
! 		/// <param name="version"></param>
! 		public ISoftLock Lock( object key, object version )
  		{
  			log.Error( "Application attempted to edit read only item: " + key );

Index: ICacheConcurrencyStrategy.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cache/ICacheConcurrencyStrategy.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ICacheConcurrencyStrategy.cs	1 Mar 2005 16:24:43 -0000	1.6
--- ICacheConcurrencyStrategy.cs	6 Mar 2005 12:44:34 -0000	1.7
***************
*** 39,45 ****
  		/// </summary>
  		/// <param name="key">The key</param>
  		/// <exception cref="CacheException"></exception>
  		/// <remarks>This method is used by "asynchronous" concurrency strategies.</remarks>
! 		ISoftLock Lock( object key );
  
  		/// <summary>
--- 39,46 ----
  		/// </summary>
  		/// <param name="key">The key</param>
+ 		/// <param name="version"></param>
  		/// <exception cref="CacheException"></exception>
  		/// <remarks>This method is used by "asynchronous" concurrency strategies.</remarks>
! 		ISoftLock Lock( object key, object version );
  
  		/// <summary>