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

Merge remote-tracking branch 'upstream/main' into wip/6.0

This commit is contained in:
Andrea Boriero 2021-08-16 16:21:26 +02:00
parent 8174f8ab9d 544dbbf762
commit ffff90757a
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,12 +153,12 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
@Override @Override
public Object get(Class entityClass, Object id) { public Object get(Class entityClass, Object id) {
return get( entityClass.getName(), id, LockMode.NONE ); return get( entityClass.getName(), id );
} }
@Override @Override
public Object get(Class entityClass, Object id, LockMode lockMode) { public Object get(Class entityClass, Object id, LockMode lockMode) {
return get( getFactory().getMetamodel().entityPersister( entityClass ), id, lockMode ); return get( entityClass.getName(), id, lockMode );
} }
@Override @Override
@ -168,13 +168,10 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
@Override @Override
public Object get(String entityName, Object id, LockMode lockMode) { public Object get(String entityName, Object id, LockMode lockMode) {
return get( getFactory().getMetamodel().entityPersister( entityName ), id, lockMode );
}
protected Object get(final EntityPersister ep, final Object id, final LockMode lockMode) {
checkOpen(); checkOpen();
Object result = ep.load( id, null, getNullSafeLockMode( lockMode ), this ); Object result = getFactory().getMetamodel().entityPersister( entityName )
.load( id, null, getNullSafeLockMode( lockMode ), this );
if ( temporaryPersistenceContext.isLoadFinished() ) { if ( temporaryPersistenceContext.isLoadFinished() ) {
temporaryPersistenceContext.clear(); temporaryPersistenceContext.clear();
} }
@ -468,7 +465,7 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
throws HibernateException { throws HibernateException {
checkOpen(); checkOpen();
if ( entityName == null ) { if ( entityName == null ) {
return getFactory().getMetamodel().entityPersister( object.getClass() ); return getFactory().getMetamodel().entityPersister( guessEntityName( object ) );
} }
else { else {
return getFactory().getMetamodel().entityPersister( entityName ).getSubclassEntityPersister( object, getFactory() ); return getFactory().getMetamodel().entityPersister( entityName ).getSubclassEntityPersister( object, getFactory() );