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

HHH-13640 : Correct DefaultLoadEventListener#proxyOrLoad to work properly enhancement but no HibernateProxy factory

This commit is contained in:
Gail Badner 2019-10-14 23:29:47 -07:00
parent 8ce4d36787
commit 57befd1a08
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
View File

@ -319,15 +319,18 @@ public class DefaultLoadEventListener extends AbstractLockUpgradeEventListener i
return createProxy( event, persister, keyToLoad, persistenceContext ); return createProxy( event, persister, keyToLoad, persistenceContext );
} }
} }
if ( !entityMetamodel.hasSubclasses() ) {
if ( keyToLoad.isBatchLoadable() ) {
// Add a batch-fetch entry into the queue for this entity
persistenceContext.getBatchFetchQueue().addBatchLoadableEntityKey( keyToLoad );
}
if ( keyToLoad.isBatchLoadable() ) { // This is the crux of HHH-11147
// Add a batch-fetch entry into the queue for this entity // create the (uninitialized) entity instance - has only id set
persistenceContext.getBatchFetchQueue().addBatchLoadableEntityKey( keyToLoad ); return persister.getBytecodeEnhancementMetadata().createEnhancedProxy( keyToLoad, true, session );
} }
// If we get here, then the entity class has subclasses and there is no HibernateProxy factory.
// This is the crux of HHH-11147 // The entity will get loaded below.
// create the (uninitialized) entity instance - has only id set
return persister.getBytecodeEnhancementMetadata().createEnhancedProxy( keyToLoad, true, session );
} }
else { else {
if ( persister.hasProxy() ) { if ( persister.hasProxy() ) {