@@ -1102,6 +1102,10 @@ else if ( isResultInitializer() ) {
11021102 else if ( data .entityHolder .getEntityInitializer () != this ) {
11031103 data .setState ( State .INITIALIZED );
11041104 }
1105+ else if ( data .shallowCached ) {
1106+ // For shallow cached entities, only the id is available, so ensure we load the data immediately
1107+ data .setInstance ( data .entityInstanceForNotify = resolveEntityInstance ( data ) );
1108+ }
11051109 }
11061110 else if ( ( entityFromExecutionContext = getEntityFromExecutionContext ( data ) ) != null ) {
11071111 // This is the entity to refresh, so don't set the state to initialized
@@ -1214,7 +1218,7 @@ protected Object resolveEntityInstance(EntityInitializerData data) {
12141218 return resolved ;
12151219 }
12161220 else {
1217- if ( rowProcessingState . isQueryCacheHit () && entityDescriptor . useShallowQueryCacheLayout () ) {
1221+ if ( data . shallowCached ) {
12181222 // We must load the entity this way, because the query cache entry contains only the primary key
12191223 data .setState ( State .INITIALIZED );
12201224 final SharedSessionContractImplementor session = rowProcessingState .getSession ();
0 commit comments