Handle exception on inTransaction apply (#5700)

helidon-io · Dec 15, 2022 · 600ac88 · 600ac88
1 parent 46d68a7
commit 600ac88
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/reactive/dbclient/jdbc/src/main/java/io/helidon/reactive/dbclient/jdbc/JdbcDbClient.java b/reactive/dbclient/jdbc/src/main/java/io/helidon/reactive/dbclient/jdbc/JdbcDbClient.java
@@ -79,7 +79,14 @@ public <U, T extends Subscribable<U>> T inTransaction(Function<DbTransaction, T>
                 dbMapperManager,
                 mapperManager);
 
-        T result = executor.apply(execute);
+        T result;
+
+        try {
+            result = executor.apply(execute);
+        } catch (RuntimeException e) {
+            execute.doRollback();
+            throw e;
+        }
 
         if (result instanceof Multi) {
             Multi<U> multi = (Multi<U>) result;

diff --git a/reactive/dbclient/jdbc/src/test/java/io/helidon/reactive/dbclient/jdbc/JdbcClientTest.java b/reactive/dbclient/jdbc/src/test/java/io/helidon/reactive/dbclient/jdbc/JdbcClientTest.java
@@ -65,6 +65,24 @@ void txErrorHandling() {
         assertThat("Wrong exception propagated.", ((RuntimeException) result).getMessage(), is(equalTo(message)));
     }
 
+    @Test
+    void txExceptionHandling() {
+        String message = "BOOM IN TX!!!";
+
+        JdbcDbClient dbClient = (JdbcDbClient) JdbcDbClientProviderBuilder.create()
+                .connectionPool(POOL)
+                .build();
+        try {
+            dbClient.inTransaction(tx -> {
+                throw new RuntimeException(message);
+            });
+        } catch (RuntimeException result) {
+            assertThat("Wrong exception propagated.", result.getMessage(), is(equalTo(message)));
+            return;
+        }
+        fail("Wrong (or no) exception propagated, expected RuntimeException!");
+    }
+
     @Test
     void txResultHandling() {
         JdbcDbClient dbClient = (JdbcDbClient) JdbcDbClientProviderBuilder.create()