HHH-13633 : Bugs join-fetching a collection when scrolling with a stateless session using enhancement as proxy

Minor changes suggested by Andrea.
This commit is contained in:
Gail Badner 2019-09-23 13:21:59 -07:00 committed by gbadner
parent 9cb4d2f411
commit cd0054cec1
1 changed files with 2 additions and 10 deletions

View File

@ -299,14 +299,6 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
// caller did not request forceful eager loading, see if we can create // caller did not request forceful eager loading, see if we can create
// some form of proxy // some form of proxy
final boolean allowBytecodeProxy = getFactory()
.getSessionFactoryOptions()
.isEnhancementAsProxyEnabled();
final boolean entityHasHibernateProxyFactory = persister.getEntityMetamodel()
.getTuplizer()
.getProxyFactory() != null;
// first, check to see if we can use "bytecode proxies" // first, check to see if we can use "bytecode proxies"
final EntityMetamodel entityMetamodel = persister.getEntityMetamodel(); final EntityMetamodel entityMetamodel = persister.getEntityMetamodel();
@ -315,7 +307,7 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
// if the entity defines a HibernateProxy factory, see if there is an // if the entity defines a HibernateProxy factory, see if there is an
// existing proxy associated with the PC - and if so, use it // existing proxy associated with the PC - and if so, use it
if ( entityHasHibernateProxyFactory ) { if ( persister.getEntityMetamodel().getTuplizer().getProxyFactory() != null ) {
final PersistenceContext persistenceContext = getPersistenceContext(); final PersistenceContext persistenceContext = getPersistenceContext();
final Object proxy = persistenceContext.getProxy( entityKey ); final Object proxy = persistenceContext.getProxy( entityKey );
@ -331,7 +323,7 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
} }
// specialized handling for entities with subclasses with a HibernateProxy factory // specialized handling for entities with subclasses with a HibernateProxy factory
if ( persister.getEntityMetamodel().hasSubclasses() ) { if ( entityMetamodel.hasSubclasses() ) {
// entities with subclasses that define a ProxyFactory can create // entities with subclasses that define a ProxyFactory can create
// a HibernateProxy. // a HibernateProxy.
LOG.debugf( "Creating a HibernateProxy for to-one association with subclasses to honor laziness" ); LOG.debugf( "Creating a HibernateProxy for to-one association with subclasses to honor laziness" );