[taler-merchant] branch master updated: insert missing rollbacks

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new f0caeb60 insert missing rollbacks
f0caeb60 is described below

commit f0caeb608b657700c46219aa9aa23959a4b303ae
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Jul 23 17:14:19 2021 +0200

    insert missing rollbacks
---
 src/backend/taler-merchant-httpd_private-post-transfers.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c 
b/src/backend/taler-merchant-httpd_private-post-transfers.c
index 5ac4ec9d..0e3f798e 100644
--- a/src/backend/taler-merchant-httpd_private-post-transfers.c
+++ b/src/backend/taler-merchant-httpd_private-post-transfers.c
@@ -1225,6 +1225,7 @@ TMH_private_post_transfers (const struct 
TMH_RequestHandler *rh,
                                      &wire_fee))
           {
             GNUNET_break (0);
+            TMH_db->rollback (TMH_db->cls);
             return TALER_MHD_reply_with_error (
               connection,
               MHD_HTTP_INTERNAL_SERVER_ERROR,
@@ -1238,6 +1239,7 @@ TMH_private_post_transfers (const struct 
TMH_RequestHandler *rh,
             GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                         "Amount of expected was %s\n",
                         TALER_amount2s (&delta));
+            TMH_db->rollback (TMH_db->cls);
             return TALER_MHD_reply_with_error (
               connection,
               MHD_HTTP_CONFLICT,
@@ -1254,6 +1256,7 @@ TMH_private_post_transfers (const struct 
TMH_RequestHandler *rh,
             GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                         "Amount submitted was %s\n",
                         TALER_amount2s (&ptc->amount));
+            TMH_db->rollback (TMH_db->cls);
             return TALER_MHD_reply_with_error (
               connection,
               MHD_HTTP_CONFLICT,
@@ -1357,6 +1360,7 @@ TMH_private_post_transfers (const struct 
TMH_RequestHandler *rh,
           "deposit_sums", deposit_sums);
       } /* end of 'verified == true' (not an 'if'!) */
     } /* end of 'switch (qs)' */
+    GNUNET_assert (0);
   } /* end of 'for(retries...) */
   return TALER_MHD_reply_with_error (connection,
                                      MHD_HTTP_INTERNAL_SERVER_ERROR,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.