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

HHH-10905 - Fix NPE when calling StatelessSession methods with null LockMode.

This commit is contained in:
Chris Cranford 2016-07-07 13:26:06 -05:00
parent 457715692c
commit acd2f238ee
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
View File

@ -178,8 +178,9 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
@Override @Override
public Object get(String entityName, Serializable id, LockMode lockMode) { public Object get(String entityName, Serializable id, LockMode lockMode) {
checkOpen(); checkOpen();
Object result = getFactory().getMetamodel().entityPersister( entityName ) Object result = getFactory().getMetamodel().entityPersister( entityName )
.load( id, null, lockMode, this ); .load( id, null, getNullSafeLockMode( lockMode ), this );
if ( temporaryPersistenceContext.isLoadFinished() ) { if ( temporaryPersistenceContext.isLoadFinished() ) {
temporaryPersistenceContext.clear(); temporaryPersistenceContext.clear();
} }
@ -227,7 +228,7 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
Object result = null; Object result = null;
try { try {
this.getLoadQueryInfluencers().setInternalFetchProfile( "refresh" ); this.getLoadQueryInfluencers().setInternalFetchProfile( "refresh" );
result = persister.load( id, entity, lockMode, this ); result = persister.load( id, entity, getNullSafeLockMode( lockMode ), this );
} }
finally { finally {
this.getLoadQueryInfluencers().setInternalFetchProfile( previousFetchProfile ); this.getLoadQueryInfluencers().setInternalFetchProfile( previousFetchProfile );
@ -669,4 +670,8 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
private JtaPlatform getJtaPlatform() { private JtaPlatform getJtaPlatform() {
return getFactory().getServiceRegistry().getService( JtaPlatform.class ); return getFactory().getServiceRegistry().getService( JtaPlatform.class );
} }
private LockMode getNullSafeLockMode(LockMode lockMode) {
return lockMode == null ? LockMode.NONE : lockMode;
}
} }