fix an obvious bug in SqmSelectClause

hibernate · May 13, 2020 · fa6acf4 · fa6acf4
1 parent 5c11778
commit fa6acf4
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectClause.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectClause.java
@@ -109,14 +109,15 @@ public List<SqmSelectableNode<?>> getSelectionItems() {
 		final List<SqmSelectableNode<?>> subSelections = new ArrayList<>();
 
 		//TODO: this has gotta be wrong!!
-		if ( this.selections != null || this.selections.size() != 1 ) {
-			this.selections.get( 0 ).getSelectableNode().visitSubSelectableNodes( subSelections::add );
-		}
-		else {
-			for ( SqmSelection<?> selection : this.selections ) {
-				selection.getSelectableNode().visitSubSelectableNodes( subSelections::add );
+		if ( this.selections != null ) {
+			if ( this.selections.size() == 1 ) {
+				this.selections.get( 0 ).getSelectableNode().visitSubSelectableNodes( subSelections::add );
+			}
+			else {
+				for ( SqmSelection<?> selection : this.selections ) {
+					selection.getSelectableNode().visitSubSelectableNodes( subSelections::add );
+				}
 			}
-
 		}
 		return subSelections;
 	}