Merge pull request #967 from d3sw/ONECOND-2235

ONECOND-2235: Fix workflow metadata delete issue
d3sw · Apr 25, 2023 · dd21ab7 · dd21ab7
2 parents b9ec444 + de31742
commit dd21ab7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/postgresql-persistence/src/main/java/com/netflix/conductor/aurora/AuroraIndexDAO.java b/postgresql-persistence/src/main/java/com/netflix/conductor/aurora/AuroraIndexDAO.java
@@ -21,6 +21,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import static java.util.Objects.nonNull;
+
 public class AuroraIndexDAO extends AuroraBaseDAO implements IndexDAO {
 
 	@Inject
@@ -120,7 +122,7 @@ public SearchResult<String> searchWorkflows(String query, String freeText, int s
 		parseQuery(query, SQL, params);
 		parseFreeText(freeText, SQL, params);
 
-		if (!sort.isEmpty()) {
+		if (nonNull(sort) && !sort.isEmpty()) {
 			SQL.append("ORDER BY ");
 			parseSort(sort, SQL);
 			SQL.append(" LIMIT ? OFFSET ?");