HHH-19551 - Address deficiencies in pessimistic locking

sebersole · sebersole · commit 876b982999e5 · 2025-07-21T07:08:24.000-05:00
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/StandardLockingClauseStrategy.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/StandardLockingClauseStrategy.java
@@ -8,7 +8,6 @@
 import org.hibernate.Locking;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.RowLockStrategy;
-import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.metamodel.mapping.EntityAssociationMapping;
 import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
@@ -17,7 +16,6 @@
 import org.hibernate.metamodel.mapping.ValuedModelPart;
 import org.hibernate.metamodel.mapping.internal.BasicValuedCollectionPart;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.entity.mutation.EntityMutationTarget;
 import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.spi.LockingClauseStrategy;
 import org.hibernate.sql.ast.spi.SqlAppender;
@@ -75,11 +73,9 @@ public StandardLockingClauseStrategy(
 	@Override
 	public void registerRoot(TableGroup root) {
 		if ( !queryHasOuterJoins && !dialect.supportsOuterJoinForUpdate() ) {
-			if ( root.getModelPart() instanceof EntityMutationTarget entityMapping ) {
-				if ( ArrayHelper.size( entityMapping.getTableMappings() ) > 1 ) {
-					// joined inheritance and/or secondary tables - inherently has outer joins
-					queryHasOuterJoins = true;
-				}
+			if ( CollectionHelper.isNotEmpty( root.getTableReferenceJoins() ) ) {
+				// joined inheritance and/or secondary tables - inherently has outer joins
+				queryHasOuterJoins = true;
 			}
 		}
 
