HHH-8921 in-memory value generation (INSERT) only works if

hibernate.id.new_generator_mappings is enabled
hibernate · Feb 7, 2014 · 8fe16b3 · 8fe16b3
1 parent 66392f1
commit 8fe16b3
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -3653,7 +3653,9 @@ else if ( ! isModifiableEntity( entry ) ) {
 
 	public Serializable insert(Object[] fields, Object object, SessionImplementor session)
 			throws HibernateException {
-
+		// apply any pre-insert in-memory value generation
+		preInsertInMemoryValueGeneration( fields, object, session );
+
 		final int span = getTableSpan();
 		final Serializable id;
 		if ( entityMetamodel.isDynamicInsert() ) {
@@ -3676,15 +3678,7 @@ public Serializable insert(Object[] fields, Object object, SessionImplementor se
 
 	public void insert(Serializable id, Object[] fields, Object object, SessionImplementor session) {
 		// apply any pre-insert in-memory value generation
-		if ( getEntityMetamodel().hasPreInsertGeneratedValues() ) {
-			final InMemoryValueGenerationStrategy[] strategies = getEntityMetamodel().getInMemoryValueGenerationStrategies();
-			for ( int i = 0; i < strategies.length; i++ ) {
-				if ( strategies[i] != null && strategies[i].getGenerationTiming().includesInsert() ) {
-					fields[i] = strategies[i].getValueGenerator().generateValue( (Session) session, object );
-					setPropertyValue( object, i, fields[i] );
-				}
-			}
-		}
+		preInsertInMemoryValueGeneration( fields, object, session );
 
 		final int span = getTableSpan();
 		if ( entityMetamodel.isDynamicInsert() ) {
@@ -3701,6 +3695,18 @@ public void insert(Serializable id, Object[] fields, Object object, SessionImple
 			}
 		}
 	}
+
+	private void preInsertInMemoryValueGeneration(Object[] fields, Object object, SessionImplementor session) {
+		if ( getEntityMetamodel().hasPreInsertGeneratedValues() ) {
+			final InMemoryValueGenerationStrategy[] strategies = getEntityMetamodel().getInMemoryValueGenerationStrategies();
+			for ( int i = 0; i < strategies.length; i++ ) {
+				if ( strategies[i] != null && strategies[i].getGenerationTiming().includesInsert() ) {
+					fields[i] = strategies[i].getValueGenerator().generateValue( (Session) session, object );
+					setPropertyValue( object, i, fields[i] );
+				}
+			}
+		}
+	}
 
 	/**
 	 * Delete an object