[taler-merchant] branch master updated: fix #6498

[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 8d73d07  fix #6498
8d73d07 is described below

commit 8d73d07d559732dbd010b802ea4ed3602964c0cd
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Aug 23 23:19:15 2020 +0200

    fix #6498
---
 src/backend/taler-merchant-httpd_get-orders-ID.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c 
b/src/backend/taler-merchant-httpd_get-orders-ID.c
index 63bf288..4167c87 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -846,8 +846,7 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
     }
   }
 
-  if ( (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) ||
-       (! contract_match) )
+  if (! contract_match)
   {
     struct TALER_ClaimTokenP db_claim_token;
 
@@ -883,9 +882,8 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
                                          TALER_EC_GET_ORDERS_ID_UNKNOWN,
                                          "order_id not found in database");
     }
-    if (god->unclaimed)
-      token_match = (0 == GNUNET_memcmp (&db_claim_token,
-                                         &god->claim_token));
+    token_match = (0 == GNUNET_memcmp (&db_claim_token,
+                                       &god->claim_token));
   }   /* end unclaimed order logic */
 
   if (NULL == god->fulfillment_url)

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