diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java index dedb60484605..f42cd9cb1d0c 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java @@ -744,7 +744,7 @@ protected void logStaticSQL() { } } - private CollectionLoader standardCollectionLoader; + private volatile CollectionLoader standardCollectionLoader; @Override public void initialize(Object key, SharedSessionContractImplementor session) throws HibernateException { @@ -752,10 +752,13 @@ public void initialize(Object key, SharedSessionContractImplementor session) thr determineLoaderToUse( key, session ).load( key, session ); } + // lazily initialize instance field via 'double-checked locking' + // see https://en.wikipedia.org/wiki/Double-checked_locking protected CollectionLoader getStandardCollectionLoader() { CollectionLoader localCopy = standardCollectionLoader; if ( localCopy == null ) { synchronized (this) { + localCopy = standardCollectionLoader; if ( localCopy == null ) { localCopy = createCollectionLoader( LoadQueryInfluencers.NONE ); standardCollectionLoader = localCopy;