HHH-18017 Fix discriminator in shallow query cache check

mbellade · mbellade · commit 2160dd8ce8ba · 2024-07-08T09:45:03.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityInitializer.java
@@ -378,7 +378,7 @@ else if ( concreteDescriptor != null
 	private EntityPersister determineConcreteEntityDescriptor(RowProcessingState rowProcessingState)
 			throws WrongClassException {
 		if ( discriminatorAssembler == null
-				|| rowProcessingState.isQueryCacheHit() && !entityDescriptor.storeDiscriminatorInShallowQueryCacheLayout() ) {
+				|| rowProcessingState.isQueryCacheHit() && entityDescriptor.useShallowQueryCacheLayout() && !entityDescriptor.storeDiscriminatorInShallowQueryCacheLayout() ) {
 			return entityDescriptor;
 		}
 		else {

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ else if ( concreteDescriptor != null`
`378`	`378`	`private EntityPersister determineConcreteEntityDescriptor(RowProcessingState rowProcessingState)`
`379`	`379`	`throws WrongClassException {`
`380`	`380`	`if ( discriminatorAssembler == null`
`381`		`- \|\| rowProcessingState.isQueryCacheHit() && !entityDescriptor.storeDiscriminatorInShallowQueryCacheLayout() ) {`
	`381`	`+ \|\| rowProcessingState.isQueryCacheHit() && entityDescriptor.useShallowQueryCacheLayout() && !entityDescriptor.storeDiscriminatorInShallowQueryCacheLayout() ) {`
`382`	`382`	`return entityDescriptor;`
`383`	`383`	`}`
`384`	`384`	`else {`