[GNUnet-SVN] [taler-merchant] branch stable updated (194c3c0 -> 7820b4b)

[gnunet]

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

dold pushed a change to branch stable
in repository merchant.

    from 194c3c0  fix two uninitialized memory accesses
     add 4711dcf  remove bad logging
     add 7820b4b  add missing commit/rollback

No new revisions were added by this update.

Summary of changes:
 src/backend/taler-merchant-httpd_tip-query.c | 7 +------
 src/backenddb/plugin_merchantdb_postgres.c   | 2 ++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_tip-query.c 
b/src/backend/taler-merchant-httpd_tip-query.c
index 7139b3f..97d3fd1 100644
--- a/src/backend/taler-merchant-httpd_tip-query.c
+++ b/src/backend/taler-merchant-httpd_tip-query.c
@@ -472,14 +472,9 @@ MH_handler_tip_query (struct TMH_RequestHandler *rh,
     }
     if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
     {
-      // We'll amount_authorized to zero later once
+      // We'll set amount_authorized to zero later once
       // we know the currency
       tqc->none_authorized = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "DB::::: authorized amount: 
NONE\n");
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "DB::::: authorized amount: %s\n", 
TALER_amount_to_string (&tqc->amount_authorized));
     }
   }
 
diff --git a/src/backenddb/plugin_merchantdb_postgres.c 
b/src/backenddb/plugin_merchantdb_postgres.c
index 881f682..48b7244 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -2867,6 +2867,7 @@ postgres_enable_tip_reserve (void *cls,
     if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != qs)
     {
       /* UUID already exists, we are done! */
+      postgres_rollback (pg);
       return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
     }
   }
@@ -3298,6 +3299,7 @@ postgres_pickup_tip (void *cls,
         postgres_rollback (pg);
         return TALER_EC_TIP_PICKUP_AMOUNT_CHANGED;
       }
+      postgres_commit (pg);
       return TALER_EC_NONE; /* we are done! */
     }
   }

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