[Hibernate-commits] Hibernate Code SVN: r10219 - trunk/Hibernate3/src/org/hibernate/persister/entity

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

Author: ste...@jb...
Date: 2006-08-04 14:24:33 -0400 (Fri, 04 Aug 2006)
New Revision: 10219

Modified:
   trunk/Hibernate3/src/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
Log:
HHH-1848 : locking on versioned joined subclasses

Modified: trunk/Hibernate3/src/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java	2006-08-04 18:24:04 UTC (rev 10218)
+++ trunk/Hibernate3/src/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java	2006-08-04 18:24:33 UTC (rev 10219)
@@ -219,7 +219,9 @@
 			jk--;
 			pc = pc.getSuperclass();
 		}
-		if (jk!=-1) throw new AssertionFailure("Tablespan does not match height of joined-subclass hiearchy.");
+		if ( jk != -1 ) {
+			throw new AssertionFailure( "Tablespan does not match height of joined-subclass hiearchy." );
+		}
 
 		// PROPERTIES
 
@@ -375,7 +377,7 @@
 	protected String getTableName(int j) {
 		return naturalOrderTableNames[j];
 	}
-	
+
 	protected String[] getKeyColumns(int j) {
 		return naturalOrderTableKeyColumns[j];
 	}
@@ -452,7 +454,9 @@
 	
 	private static int getTableId(String tableName, String[] tables) {
 		for ( int j=0; j<tables.length; j++ ) {
-			if ( tableName.equals( tables[j] ) ) return j;
+			if ( tableName.equals( tables[j] ) ) {
+				return j;
+			}
 		}
 		throw new AssertionFailure("Table " + tableName + " not found");
 	}
@@ -554,7 +558,9 @@
 
 	public String getPropertyTableName(String propertyName) {
 		Integer index = getEntityMetamodel().getPropertyIndexOrNull(propertyName);
-		if (index==null) return null;
+		if ( index == null ) {
+			return null;
+		}
 		return tableNames[ propertyTableNumbers[ index.intValue() ] ];
 	}
 
@@ -565,4 +571,8 @@
 	public String[][] getContraintOrderedTableKeyColumnClosure() {
 		return constraintOrderedKeyColumnNames;
 	}
+
+	public String getRootTableName() {
+		return naturalOrderTableNames[0];
+	}
 }