Issue #4719 - Helidon DBClient does not trigger an Exception when no …

…sane DB connection can be obtained (#4771) Signed-off-by: Tomas Kraus <[email protected]>
helidon-io · Sep 30, 2022 · 8ec4cab · 8ec4cab
1 parent af2c032
commit 8ec4cab
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/dbclient/jdbc/src/main/java/io/helidon/dbclient/jdbc/JdbcStatementDml.java b/dbclient/jdbc/src/main/java/io/helidon/dbclient/jdbc/JdbcStatementDml.java
@@ -54,7 +54,13 @@ private Single<Long> doExecute(DbClientServiceContext dbContext,
                                    CompletableFuture<Long> queryFuture) {
 
         executorService().submit(() -> {
-            connection().thenAccept(conn -> callStatement(dbContext, conn, statementFuture, queryFuture));
+            connection()
+                    .thenAccept(conn -> callStatement(dbContext, conn, statementFuture, queryFuture))
+                    .exceptionally(t -> {
+                        statementFuture.completeExceptionally(t);
+                        queryFuture.completeExceptionally(t);
+                        return null;
+                    });
         });
 
         // the query future is reused, as it completes with the number of updated records