merchant

commit a99831004017312d7c85044b94753b4f67194cc7
parent 8f8d1a202d46c4315affbecdc683d9a3013be0c7
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Sat, 25 Jun 2016 14:33:52 +0200

error message for non parse instance

Diffstat:
M
src/backend/taler-merchant-httpd.c
 | 
2
+-
M
src/backend/taler-merchant-httpd_pay.c
 | 
2
++

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -574,7 +574,7 @@ iterate_instances (const struct GNUNET_CONFIGURATION_Handle *config,
   if (0 != (GNUNET_SYSERR & iic->ret))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-               "No default merchant instance found\n");
+               "At least one instance has not been successfully parsed\n");
     goto fail;
   }
 
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c
@@ -918,6 +918,8 @@ MH_handler_pay (struct TMH_RequestHandler *rh,
       return (GNUNET_NO == res) ? MHD_YES : MHD_NO;
     }
     pc->mi = get_instance (root);
+    GNUNET_assert (NULL !=
+                    (pc->mi = get_instance (root)));
     pc->chosen_exchange = GNUNET_strdup (chosen_exchange);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Parsed JSON for /pay.\n");