From 6034ece73101d418ab4e5a2151f8a1760063504e Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Tue, 29 Oct 2019 12:43:38 +0000 Subject: [PATCH] HHH-13654 Refactor references to StatefulPersistenceContext#batchFetchQueue --- .../internal/StatefulPersistenceContext.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java index ffcb3ef96d..8b0e547ff6 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java @@ -384,8 +384,9 @@ public class StatefulPersistenceContext implements PersistenceContext { @Override public void addEntity(EntityKey key, Object entity) { entitiesByKey.put( key, entity ); - if( batchFetchQueue != null ) { - getBatchFetchQueue().removeBatchLoadableEntityKey(key); + final BatchFetchQueue fetchQueue = this.batchFetchQueue; + if ( fetchQueue != null ) { + fetchQueue.removeBatchLoadableEntityKey(key); } } @@ -419,9 +420,10 @@ public class StatefulPersistenceContext implements PersistenceContext { if ( nullifiableEntityKeys != null ) { nullifiableEntityKeys.remove( key ); } - if( batchFetchQueue != null ) { - getBatchFetchQueue().removeBatchLoadableEntityKey( key ); - getBatchFetchQueue().removeSubselect( key ); + final BatchFetchQueue fetchQueue = this.batchFetchQueue; + if ( fetchQueue != null ) { + fetchQueue.removeBatchLoadableEntityKey( key ); + fetchQueue.removeSubselect( key ); } return entity; } @@ -1044,9 +1046,10 @@ public class StatefulPersistenceContext implements PersistenceContext { @Override public Object removeProxy(EntityKey key) { - if ( batchFetchQueue != null ) { - batchFetchQueue.removeBatchLoadableEntityKey( key ); - batchFetchQueue.removeSubselect( key ); + final BatchFetchQueue fetchQueue = this.batchFetchQueue; + if ( fetchQueue != null ) { + fetchQueue.removeBatchLoadableEntityKey( key ); + fetchQueue.removeSubselect( key ); } return removeProxyByKey( key ); }