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

HHH-14877 - FetchMode.SUBSELECT ignored 

- fixed Oracle errors related to follow-on locking
This commit is contained in:
Steve Ebersole 2021-10-20 11:05:25 -05:00
parent 653de50aa5
commit 96c0b04658
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/main/java/org/hibernate/sql/exec/spi/ExecutionContext.java
View File

@ -34,10 +34,6 @@ public interface ExecutionContext {
Callback getCallback(); Callback getCallback();
default void invokeAfterLoadActions(SharedSessionContractImplementor session, Object entity, Loadable persister) {
// No-op because by default there is no callback
}
default String getQueryIdentifier(String sql) { default String getQueryIdentifier(String sql) {
return null; return null;
} }

18
hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesSourceProcessingStateStandardImpl.java
View File

@ -21,6 +21,7 @@ import org.hibernate.event.spi.PostLoadEvent;
import org.hibernate.event.spi.PostLoadEventListener; import org.hibernate.event.spi.PostLoadEventListener;
import org.hibernate.event.spi.PreLoadEvent; import org.hibernate.event.spi.PreLoadEvent;
import org.hibernate.persister.entity.Loadable; import org.hibernate.persister.entity.Loadable;
import org.hibernate.sql.exec.spi.Callback;
import org.hibernate.sql.results.graph.Initializer; import org.hibernate.sql.results.graph.Initializer;
import org.hibernate.sql.results.graph.collection.internal.ArrayInitializer; import org.hibernate.sql.results.graph.collection.internal.ArrayInitializer;
import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryOptions;
@ -190,16 +191,17 @@ public class JdbcValuesSourceProcessingStateStandardImpl implements JdbcValuesSo
postLoadEvent.setEntity( loadingEntityEntry.getEntityInstance() ) postLoadEvent.setEntity( loadingEntityEntry.getEntityInstance() )
.setId( entityKey.getIdentifier() ) .setId( entityKey.getIdentifier() )
.setPersister( loadingEntityEntry.getDescriptor() ); .setPersister( loadingEntityEntry.getDescriptor() );
for ( PostLoadEventListener listener : listenerGroup.listeners() ) { listenerGroup.fireEventOnEachListener( postLoadEvent, PostLoadEventListener::onPostLoad );
listener.onPostLoad( postLoadEvent );
}
} }
executionContext.invokeAfterLoadActions( final Callback callback = executionContext.getCallback();
getSession(), if ( callback != null ) {
loadingEntityEntry.getEntityInstance(), callback.invokeAfterLoadActions(
(Loadable) loadingEntityEntry.getDescriptor() getSession(),
); loadingEntityEntry.getEntityInstance(),
(Loadable) loadingEntityEntry.getDescriptor()
);
}
} }
); );
loadingEntityMap = null; loadingEntityMap = null;