[Hibernate-commits] Hibernate Code SVN: r10181 - in branches/Branch_3_2/Hibernate3/src/org/hibernate: cfg dialect persister/entity

[<hib...@li...>]

Author: epbernard
Date: 2006-07-28 16:17:50 -0400 (Fri, 28 Jul 2006)
New Revision: 10181

Modified:
   branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/ResultSetMappingBinder.java
   branches/Branch_3_2/Hibernate3/src/org/hibernate/dialect/Dialect.java
   branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java
Log:
HHH-1958 add force to entity persister lock modes

Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/ResultSetMappingBinder.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/ResultSetMappingBinder.java	2006-07-28 20:17:01 UTC (rev 10180)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/ResultSetMappingBinder.java	2006-07-28 20:17:50 UTC (rev 10181)
@@ -353,12 +353,12 @@
 		else if ( "upgrade-nowait".equals( lockMode ) ) {
 			return LockMode.UPGRADE_NOWAIT;
 		}
-		else if ( "upgrade-nowait".equals( lockMode ) ) {
-			return LockMode.UPGRADE_NOWAIT;
-		}
 		else if ( "write".equals( lockMode ) ) {
 			return LockMode.WRITE;
 		}
+		else if ( "force".equals( lockMode ) ) {
+			return LockMode.FORCE;
+		}
 		else {
 			throw new MappingException( "unknown lockmode" );
 		}

Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/dialect/Dialect.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/dialect/Dialect.java	2006-07-28 20:17:01 UTC (rev 10180)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/dialect/Dialect.java	2006-07-28 20:17:50 UTC (rev 10181)
@@ -999,6 +999,9 @@
 		else if ( lockMode==LockMode.UPGRADE_NOWAIT ) {
 			return getForUpdateNowaitString();
 		}
+		else if ( lockMode==LockMode.FORCE ) {
+			return getForUpdateNowaitString();
+		}
 		else {
 			return "";
 		}

Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java	2006-07-28 20:17:01 UTC (rev 10180)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java	2006-07-28 20:17:50 UTC (rev 10181)
@@ -1267,6 +1267,7 @@
 		lockers.put( LockMode.READ, generateLocker( LockMode.READ ) );
 		lockers.put( LockMode.UPGRADE, generateLocker( LockMode.UPGRADE ) );
 		lockers.put( LockMode.UPGRADE_NOWAIT, generateLocker( LockMode.UPGRADE_NOWAIT ) );
+		lockers.put( LockMode.FORCE, generateLocker( LockMode.FORCE ) );
 	}
 
 	protected LockingStrategy generateLocker(LockMode lockMode) {
@@ -2853,6 +2854,12 @@
 						readLoader :
 						createEntityLoader( LockMode.UPGRADE_NOWAIT )
 			);
+		loaders.put(
+				LockMode.FORCE,
+				disableForUpdate ?
+						readLoader :
+						createEntityLoader( LockMode.FORCE )
+			);
 
 		loaders.put(
 				"merge",