HHH-16820 When batching enabled the LockModeType is ignored

hibernate · Jun 27, 2023 · bdcc619 · bdcc619
1 parent bbbf8e9
commit bdcc619
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...rnate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractEntityBatchLoader.java b/...rnate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractEntityBatchLoader.java
@@ -7,6 +7,7 @@
 package org.hibernate.loader.ast.internal;
 
 import org.hibernate.Hibernate;
+import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -89,7 +90,8 @@ private T load(
 			LockOptions lockOptions,
 			Boolean readOnly,
 			SharedSessionContractImplementor session) {
-		if ( hasSingleId ) {
+		// We disable batching if lockMode != NONE
+		if ( hasSingleId || lockOptions.getLockMode() != LockMode.NONE ) {
 			return singleIdLoader.load( id, entityInstance, lockOptions, readOnly, session );
 		}