Short-circuit CompletableFuture returned by Startables#deepStart on e…

…xception
testcontainers · Sep 30, 2022 · a325af9 · a325af9
1 parent 14687a6
commit a325af9
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/core/src/main/java/org/testcontainers/lifecycle/Startables.java b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
@@ -99,6 +99,19 @@ private CompletableFuture<Void> deepStart(
             })
             .toArray(CompletableFuture[]::new);
 
-        return CompletableFuture.allOf(futures);
+        return allOfFailfast(futures);
+    }
+
+    private static <T> CompletableFuture<Void> allOfFailfast(CompletableFuture<?>[] futures) {
+        CompletableFuture<Void> result = CompletableFuture.allOf(futures);
+        for (CompletableFuture<?> future : futures) {
+            future.whenComplete((t, ex) -> {
+                if (ex != null) {
+                    result.completeExceptionally(ex);
+                }
+            });
+        }
+
+        return result;
     }
 }