From 4bd5ca85da5a6cf1090551be05f1e490b619c776 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Thu, 27 Jun 2019 15:33:05 +0100 Subject: [PATCH] HHH-11147 Avoid allocating a BatchFetchQueue if batching was not enabled --- .../hibernate/event/internal/DefaultLoadEventListener.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java index 323a9e6c24..85237005ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java @@ -313,8 +313,10 @@ private Object proxyOrLoad( } } - // Potentially add a batch-fetch entry into the queue for this entity - persistenceContext.getBatchFetchQueue().addBatchLoadableEntityKey( keyToLoad ); + if ( keyToLoad.isBatchLoadable() ) { + // Add a batch-fetch entry into the queue for this entity + persistenceContext.getBatchFetchQueue().addBatchLoadableEntityKey( keyToLoad ); + } // This is the crux of HHH-11147 // create the (uninitialized) entity instance - has only id set