Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-27 14:30:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SessionImpl#buildLockOptions causing NPE

Browse Source
This commit is contained in:
Andrea Boriero 2020-07-20 09:08:05 +01:00
parent 9ba18b8c5d
commit 3e3db6d352
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
View File

@ -2919,12 +2919,15 @@ public void refresh(Object entity, LockModeType lockModeType, Map<String, Object
}
private LockOptions buildLockOptions(LockModeType lockModeType, Map<String, Object> properties) {
final LockOptions output = this.lockOptions.makeCopy();
output.setLockMode( LockModeTypeHelper.getLockMode( lockModeType ) );
if ( properties != null ) {
LockOptionsHelper.applyPropertiesToLockOptions( properties, () -> output );
LockOptions lockOptions = new LockOptions();
if ( this.lockOptions != null ) { //otherwise the default LockOptions constructor is the same as DEFAULT_LOCK_OPTIONS
LockOptions.copy( this.lockOptions, lockOptions );
}
return output;
lockOptions.setLockMode( LockModeTypeHelper.getLockMode( lockModeType ) );
if ( properties != null ) {
LockOptionsHelper.applyPropertiesToLockOptions( properties, () -> lockOptions );
}
return lockOptions;
}
@Override