[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated: oops, check query r
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated: oops, check query result first |
Date: |
Tue, 27 Aug 2019 00:37:52 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new c391985 oops, check query result first
c391985 is described below
commit c391985dd7ce9c1ed81b8ca9cf7dde43c9a0987c
Author: Florian Dold <address@hidden>
AuthorDate: Tue Aug 27 00:37:50 2019 +0200
oops, check query result first
---
src/backend/taler-merchant-httpd_check-payment.c | 31 ++++++++++++------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_check-payment.c
b/src/backend/taler-merchant-httpd_check-payment.c
index e5e82da..a52c4f5 100644
--- a/src/backend/taler-merchant-httpd_check-payment.c
+++ b/src/backend/taler-merchant-httpd_check-payment.c
@@ -374,6 +374,21 @@ MH_handler_check_payment (struct TMH_RequestHandler *rh,
"db error fetching contract
terms");
}
+ if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+ {
+ /* Check that we're at least aware of the order */
+ ret = check_order_and_request_payment (connection,
+ mi,
+ final_contract_url,
+ session_id,
+ fulfillment_url,
+ order_id);
+ GNUNET_free (final_contract_url);
+ return ret;
+ }
+
+ GNUNET_assert (NULL != contract_terms);
+
/* Get the amount and fulfillment_url from the contract. */
{
struct TALER_Amount amount;
@@ -394,22 +409,6 @@ MH_handler_check_payment (struct TMH_RequestHandler *rh,
TALER_amount_get_zero (amount.currency, &refund_amount);
}
-
- if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
- {
- /* Check that we're at least aware of the order */
- ret = check_order_and_request_payment (connection,
- mi,
- final_contract_url,
- session_id,
- fulfillment_url,
- order_id);
- GNUNET_free (final_contract_url);
- return ret;
- }
-
- GNUNET_assert (NULL != contract_terms);
-
if (GNUNET_OK !=
TALER_JSON_hash (contract_terms,
&h_contract_terms))
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant] branch master updated: oops, check query result first,
gnunet <=