HHH-14438 - ValueHandlers are broken

hibernate · Feb 5, 2021 · 3b82950 · 3b82950
1 parent cfc7b97
commit 3b82950
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/CriteriaQueryTupleTransformer.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/CriteriaQueryTupleTransformer.java
@@ -46,7 +46,7 @@ public Object transformTuple(Object[] tuple, String[] aliases) {
 
 		return tupleElements == null
 				? valueHandlerResult.length == 1 ? valueHandlerResult[0] : valueHandlerResult
-				: new TupleImpl( tuple );
+				: new TupleImpl( valueHandlerResult );
 
 	}
 

diff --git a/...src/main/java/org/hibernate/query/criteria/internal/expression/CompoundSelectionImpl.java b/...src/main/java/org/hibernate/query/criteria/internal/expression/CompoundSelectionImpl.java
@@ -63,7 +63,7 @@ public List<ValueHandlerFactory.ValueHandler> getValueHandlers() {
 			valueHandlers.add( valueHandler );
 			foundHandlers = foundHandlers || valueHandler != null;
 		}
-		return foundHandlers ? null : valueHandlers;
+		return foundHandlers ? valueHandlers : null;
 	}
 
 	public void registerParameters(ParameterRegistry registry) {