[taler-merchant] branch master updated (76e52c42 -> 366a2226)

[gnunet]

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

grothoff pushed a change to branch master
in repository merchant.

    from 76e52c42 dependency version bumping
     new be699a77 terminate exchange interactions if we get an error
     new c7bddf16 comment out weird code by Oec
     new 366a2226 disable work-around for bug 8209 so we can reproduce it first

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/backend/taler-merchant-httpd_post-orders-ID-pay.c | 19 +++++++++++++++++++
 src/backenddb/plugin_merchantdb_postgres.c            |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c 
b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
index 8a5b7993..4ba5411e 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
@@ -652,6 +652,25 @@ resume_pay_with_response (struct PayContext *pc,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Resuming /pay handling. HTTP status for our reply is %u.\n",
               response_code);
+#if PARTIAL_FIX_8209
+  for (unsigned int i = 0; i<pc->num_exchanges; i++)
+  {
+    struct ExchangeGroup *eg = pc->egs[i];
+
+    if (NULL != eg->fo)
+    {
+      TMH_EXCHANGES_keys4exchange_cancel (eg->fo);
+      eg->fo = NULL;
+      pc->pending_at_eg--;
+    }
+    if (NULL != eg->bdh)
+    {
+      TALER_EXCHANGE_batch_deposit_cancel (eg->bdh);
+      eg->bdh = NULL;
+    }
+  }
+  GNUNET_assert (0 == pc->pending_at_eg);
+#endif
   if (NULL != pc->timeout_task)
   {
     GNUNET_SCHEDULER_cancel (pc->timeout_task);
diff --git a/src/backenddb/plugin_merchantdb_postgres.c 
b/src/backenddb/plugin_merchantdb_postgres.c
index e9cc7efd..96b7ac5f 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -214,11 +214,13 @@ postgres_create_tables (void *cls)
                                      NULL);
   if (NULL == conn)
     return GNUNET_SYSERR;
+#if WTF_OEC
   if (0 >
       GNUNET_PQ_eval_prepared_non_select (conn,
                                           "create_tables",
                                           params))
     ret = GNUNET_SYSERR;
+#endif
   ret = GNUNET_PQ_exec_sql (conn,
                             "procedures");
   GNUNET_PQ_disconnect (conn);

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