HHH-19896 Criteria select case expressions: NPE when second query contains an otherwise case expression but not the first query

dreab8 · dreab8 · commit 9f39c0ab7fbd · 2025-10-28T13:49:53.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmCacheable.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmCacheable.java
@@ -20,7 +20,7 @@ public interface SqmCacheable {
 	int cacheHashCode();
 
 	static boolean areCompatible(@Nullable SqmCacheable e1, @Nullable SqmCacheable e2) {
-		return e1 == null ? e2 == null : e1.isCompatible( e2 );
+		return e1 == null ? e2 == null : e2 != null && e1.isCompatible( e2 );
 	}
 
 	static boolean areCompatible(@Nullable Collection<? extends SqmCacheable> collection1, @Nullable Collection<? extends SqmCacheable> collection2) {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public interface SqmCacheable {`
`20`	`20`	`int cacheHashCode();`
`21`	`21`
`22`	`22`	`static boolean areCompatible(@Nullable SqmCacheable e1, @Nullable SqmCacheable e2) {`
`23`		`- return e1 == null ? e2 == null : e1.isCompatible( e2 );`
	`23`	`+ return e1 == null ? e2 == null : e2 != null && e1.isCompatible( e2 );`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`static boolean areCompatible(@Nullable Collection<? extends SqmCacheable> collection1, @Nullable Collection<? extends SqmCacheable> collection2) {`