From 97b653aaecebc4bd51e59dc09bc9e0f0641b3b3c Mon Sep 17 00:00:00 2001 From: Gavin Date: Sun, 21 May 2023 22:23:47 +0200 Subject: [PATCH] HHH-16651 ooops, fix condition on affected-by --- .../main/java/org/hibernate/loader/ast/spi/Loadable.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loadable.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loadable.java index d048e963d6..80eb6c8041 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loadable.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loadable.java @@ -32,17 +32,22 @@ default boolean isAffectedByInfluencers(LoadQueryInfluencers influencers) { return isAffectedByEntityGraph( influencers ) || isAffectedByEnabledFetchProfiles( influencers ) || isAffectedByEnabledFilters( influencers ) - || influencers.getBatchSize() != getBatchSize(); + || isAffectedByBatchSize( influencers ); } default boolean isNotAffectedByInfluencers(LoadQueryInfluencers influencers) { return !isAffectedByEntityGraph( influencers ) && !isAffectedByEnabledFetchProfiles( influencers ) && !isAffectedByEnabledFilters( influencers ) - && influencers.getBatchSize() == getBatchSize() + && !isAffectedByBatchSize( influencers ) && influencers.getEnabledCascadingFetchProfile() == null; } + private boolean isAffectedByBatchSize(LoadQueryInfluencers influencers) { + return influencers.getBatchSize() > 0 + && influencers.getBatchSize() != getBatchSize(); + } + int getBatchSize(); /**