[Hibernate-commits] Hibernate3/src/org/hibernate/action EntityInsertAction.java,1.33,1.34 EntityUpdateAction.java,1.33,1.34

[<ste...@us...>]

Update of /cvsroot/hibernate/Hibernate3/src/org/hibernate/action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7349/src/org/hibernate/action

Modified Files:
	EntityInsertAction.java EntityUpdateAction.java 
Log Message:
HHH-1457 : JBossCache 1.3.0 optimistic locking support

Index: EntityInsertAction.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/action/EntityInsertAction.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- EntityInsertAction.java	26 Sep 2005 19:29:02 -0000	1.33
+++ EntityInsertAction.java	9 Feb 2006 20:48:42 -0000	1.34
@@ -88,7 +88,8 @@
 					session.getEntityMode(), 
 					session.getFactory() 
 				);
-			boolean put = persister.getCache().insert(ck, cacheEntry);
+//			boolean put = persister.getCache().insert(ck, cacheEntry);
+			boolean put = persister.getCache().insert( ck, cacheEntry, version );
 			
 			if ( put && factory.getStatistics().isStatisticsEnabled() ) {
 				factory.getStatisticsImplementor()

Index: EntityUpdateAction.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/action/EntityUpdateAction.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- EntityUpdateAction.java	26 Sep 2005 19:29:02 -0000	1.33
+++ EntityUpdateAction.java	9 Feb 2006 20:48:42 -0000	1.34
@@ -140,7 +140,8 @@
 						instance
 					);
 				cacheEntry = persister.getCacheEntryStructure().structure(ce);
-				boolean put = persister.getCache().update(ck, cacheEntry);
+//				boolean put = persister.getCache().update(ck, cacheEntry);
+				boolean put = persister.getCache().update( ck, cacheEntry, nextVersion, previousVersion );
 				
 				if ( put && factory.getStatistics().isStatisticsEnabled() ) {
 					factory.getStatisticsImplementor()