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

HHH-7245

This commit is contained in:
Guenther Demetz 2012-05-02 14:55:00 +02:00 committed by Steve Ebersole
parent f5e6a44f7e
commit 94cb6b82b5
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -410,14 +410,24 @@ public class DefaultLoadEventListener extends AbstractLockUpgradeEventListener i
entity = loadFromSecondLevelCache(event, persister, options);
if ( entity != null ) {
if ( traceEnabled ) LOG.tracev( "Resolved object in second-level cache: {0}",
MessageHelper.infoString( persister, event.getEntityId(), event.getSession().getFactory() ) );
return entity;
MessageHelper.infoString( persister, event.getEntityId(), event.getSession().getFactory() ) );
}
else {
if ( traceEnabled ) LOG.tracev( "Object not resolved in any cache: {0}",
MessageHelper.infoString( persister, event.getEntityId(), event.getSession().getFactory() ) );
entity = loadFromDatasource(event, persister, keyToLoad, options);
}
if (entity != null && persister.hasNaturalIdentifier()) {
event.getSession().getPersistenceContext().getNaturalIdHelper().cacheNaturalIdCrossReferenceFromLoad(
persister,
event.getEntityId(),
event.getSession().getPersistenceContext().getNaturalIdHelper().extractNaturalIdValues( entity, persister )
);
}
if ( traceEnabled ) LOG.tracev( "Object not resolved in any cache: {0}",
MessageHelper.infoString( persister, event.getEntityId(), event.getSession().getFactory() ) );
return loadFromDatasource(event, persister, keyToLoad, options);
return entity;
}
/**
@ -443,14 +453,6 @@ public class DefaultLoadEventListener extends AbstractLockUpgradeEventListener i
source
);
if (entity != null && persister.hasNaturalIdentifier()) {
event.getSession().getPersistenceContext().getNaturalIdHelper().cacheNaturalIdCrossReferenceFromLoad(
persister,
event.getEntityId(),
source.getPersistenceContext().getNaturalIdHelper().extractNaturalIdValues( entity, persister )
);
}
if ( event.isAssociationFetch() && source.getFactory().getStatistics().isStatisticsEnabled() ) {
source.getFactory().getStatisticsImplementor().fetchEntity( event.getEntityClassName() );
}