fix NPEs in StepResult.merge

OrnitheMC · Jun 16, 2024 · 2075675 · 2075675
1 parent 5ca1172
commit 2075675
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/groovy/com/github/winplay02/gitcraft/pipeline/Step.java b/src/main/groovy/com/github/winplay02/gitcraft/pipeline/Step.java
@@ -62,11 +62,11 @@ public enum StepResult implements Comparator<StepResult> {
 		FAILED;
 
 		public static StepResult merge(StepResult... results) {
-			return Arrays.stream(results).max(StepResult::compareTo).orElse(NOT_RUN);
+			return Arrays.stream(results).filter(r -> r != null).max(StepResult::compareTo).orElse(NOT_RUN);
 		}
 
 		public static StepResult merge(Collection<StepResult> results) {
-			return results.stream().max(StepResult::compareTo).orElse(NOT_RUN);
+			return results.stream().filter(r -> r != null).max(StepResult::compareTo).orElse(NOT_RUN);
 		}
 
 		@Override