Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-10513 - Fix locking WARN message logged when query LockMode is NONE

This commit is contained in:
Andrea Boriero 2016-05-25 22:30:55 +01:00
parent 4a15d23aec
commit 8e3e01340f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-core/src/main/java/org/hibernate/loader/Loader.java
View File

@ -253,7 +253,9 @@ public abstract class Loader {
final LockMode lockMode = determineFollowOnLockMode( parameters.getLockOptions() ); final LockMode lockMode = determineFollowOnLockMode( parameters.getLockOptions() );
final LockOptions lockOptions = new LockOptions( lockMode ); final LockOptions lockOptions = new LockOptions( lockMode );
if ( lockOptions.getLockMode() != LockMode.UPGRADE_SKIPLOCKED ) { if ( lockOptions.getLockMode() != LockMode.UPGRADE_SKIPLOCKED ) {
if ( lockOptions.getLockMode() != LockMode.NONE ) {
LOG.usingFollowOnLocking(); LOG.usingFollowOnLocking();
}
lockOptions.setTimeOut( parameters.getLockOptions().getTimeOut() ); lockOptions.setTimeOut( parameters.getLockOptions().getTimeOut() );
lockOptions.setScope( parameters.getLockOptions().getScope() ); lockOptions.setScope( parameters.getLockOptions().getScope() );
afterLoadActions.add( afterLoadActions.add(
@ -278,9 +280,13 @@ public abstract class Loader {
final LockMode lockModeToUse = lockOptions.findGreatestLockMode(); final LockMode lockModeToUse = lockOptions.findGreatestLockMode();
if ( lockOptions.hasAliasSpecificLockModes() ) { if ( lockOptions.hasAliasSpecificLockModes() ) {
if ( lockOptions.getLockMode() == LockMode.NONE && lockModeToUse == LockMode.NONE ) {
return lockModeToUse;
}
else {
LOG.aliasSpecificLockingWithFollowOnLocking( lockModeToUse ); LOG.aliasSpecificLockingWithFollowOnLocking( lockModeToUse );
} }
}
return lockModeToUse; return lockModeToUse;
} }