HHH-13453 Optimise CascadingActions for the most likely case

hibernate · Jun 25, 2019 · 2ea0505 · 2ea0505
1 parent cf1b7c3
commit 2ea0505
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java
@@ -369,21 +369,20 @@ public void noCascade(
 				int propertyIndex) {
 			if ( propertyType.isEntityType() ) {
 				Object child = persister.getPropertyValue( parent, propertyIndex );
-				String childEntityName = ((EntityType) propertyType).getAssociatedEntityName( session.getFactory() );
-
 				if ( child != null
 						&& !isInManagedState( child, session )
-						&& !(child instanceof HibernateProxy) //a proxy cannot be transient and it breaks ForeignKeys.isTransient
-						&& ForeignKeys.isTransient( childEntityName, child, null, session ) ) {
-					String parentEntityName = persister.getEntityName();
-					String propertyName = persister.getPropertyNames()[propertyIndex];
-					throw new TransientPropertyValueException(
+						&& !(child instanceof HibernateProxy) ) { //a proxy cannot be transient and it breaks ForeignKeys.isTransient
+					final String childEntityName = ((EntityType) propertyType).getAssociatedEntityName(session.getFactory());
+					if (ForeignKeys.isTransient(childEntityName, child, null, session)) {
+						String parentEntityName = persister.getEntityName();
+						String propertyName = persister.getPropertyNames()[propertyIndex];
+						throw new TransientPropertyValueException(
 							"object references an unsaved transient instance - save the transient instance before flushing",
 							childEntityName,
 							parentEntityName,
 							propertyName
-					);
-
+						);
+					}
 				}
 			}
 		}