HHH-8276 - Fix NullPointerException when hibernate.max_fetch_depth is not configured

gbadner · sebersole · commit bf440a4231fa · 2013-10-08T22:13:52.000-05:00
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan2/build/internal/FetchStyleLoadPlanBuildingAssociationVisitationStrategy.java b/hibernate-core/src/main/java/org/hibernate/loader/plan2/build/internal/FetchStyleLoadPlanBuildingAssociationVisitationStrategy.java
@@ -106,7 +106,8 @@ protected FetchStrategy determineFetchStrategy(AssociationAttributeDefinition at
 	protected FetchStrategy adjustJoinFetchIfNeeded(
 			AssociationAttributeDefinition attributeDefinition,
 			FetchStrategy fetchStrategy) {
-		if ( currentDepth() > sessionFactory().getSettings().getMaximumFetchDepth() ) {
+		final Integer maxFetchDepth = sessionFactory().getSettings().getMaximumFetchDepth();
+		if ( maxFetchDepth != null && currentDepth() > maxFetchDepth ) {
 			return new FetchStrategy( fetchStrategy.getTiming(), FetchStyle.SELECT );
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,8 @@ protected FetchStrategy determineFetchStrategy(AssociationAttributeDefinition at`
`106`	`106`	`protected FetchStrategy adjustJoinFetchIfNeeded(`
`107`	`107`	`AssociationAttributeDefinition attributeDefinition,`
`108`	`108`	`FetchStrategy fetchStrategy) {`
`109`		`- if ( currentDepth() > sessionFactory().getSettings().getMaximumFetchDepth() ) {`
	`109`	`+ final Integer maxFetchDepth = sessionFactory().getSettings().getMaximumFetchDepth();`
	`110`	`+ if ( maxFetchDepth != null && currentDepth() > maxFetchDepth ) {`
`110`	`111`	`return new FetchStrategy( fetchStrategy.getTiming(), FetchStyle.SELECT );`
`111`	`112`	`}`
`112`	`113`