[taler-merchant] branch master updated: -fix unregister

[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 fcfeadbb -fix unregister
fcfeadbb is described below

commit fcfeadbb15ebd272f0f6351778a6bd970c6e6b3b
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Nov 4 11:14:51 2022 +0100

    -fix unregister
---
 src/backenddb/drop.sql                         | 3 +--
 src/testing/testing_api_cmd_wallet_get_order.c | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backenddb/drop.sql b/src/backenddb/drop.sql
index 3a88feac..98e1225d 100644
--- a/src/backenddb/drop.sql
+++ b/src/backenddb/drop.sql
@@ -24,8 +24,7 @@ BEGIN;
 -- latest requirements for dropping tables.
 
 -- Unregister patch (0003.sql)
---SELECT _v.unregister_patch('merchant-0003');
-
+SELECT _v.unregister_patch('merchant-0003');
 SELECT _v.unregister_patch('merchant-0002');
 SELECT _v.unregister_patch('merchant-0001');
 
diff --git a/src/testing/testing_api_cmd_wallet_get_order.c 
b/src/testing/testing_api_cmd_wallet_get_order.c
index 771dc6f8..ac448499 100644
--- a/src/testing/testing_api_cmd_wallet_get_order.c
+++ b/src/testing/testing_api_cmd_wallet_get_order.c
@@ -560,8 +560,9 @@ wallet_poll_order_cb (
       pos->refund_available = owgr->details.success.refund_amount;
     break;
   case MHD_HTTP_PAYMENT_REQUIRED:
-    pos->already_paid_order_id = GNUNET_strdup (
-      owgr->details.payment_required.already_paid_order_id);
+    if (NULL != owgr->details.payment_required.already_paid_order_id)
+      pos->already_paid_order_id = GNUNET_strdup (
+        owgr->details.payment_required.already_paid_order_id);
     break;
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,

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