[GNUnet-SVN] [taler-merchant] branch master updated: Florian is right, this should be a 409, not 500

[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 0bc2f82  Florian is right, this should be a 409, not 500
0bc2f82 is described below

commit 0bc2f82eeeafd47a948c024805403c539ddeb8d3
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Jan 19 02:29:20 2018 +0100

    Florian is right, this should be a 409, not 500
---
 src/backend/taler-merchant-httpd_tip-pickup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/taler-merchant-httpd_tip-pickup.c 
b/src/backend/taler-merchant-httpd_tip-pickup.c
index 5751747..79248d7 100644
--- a/src/backend/taler-merchant-httpd_tip-pickup.c
+++ b/src/backend/taler-merchant-httpd_tip-pickup.c
@@ -212,7 +212,7 @@ run_pickup (struct MHD_Connection *connection,
       human = "tip identifier not known to this service";
       break;
     case TALER_EC_TIP_PICKUP_NO_FUNDS:
-      response_code = MHD_HTTP_SERVICE_UNAVAILABLE;
+      response_code = MHD_HTTP_CONFLICT;
       human = "withdrawn funds exceed amounts approved for tip";
       break;
     default:

-- 
To stop receiving notification emails like this one, please contact
address@hidden