[taler-exchange] branch master updated (5ff708d3 -> c4cc1ea1)

[gnunet]

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

grothoff pushed a change to branch master
in repository exchange.

 discard 5ff708d3 -fix 200 vs. 204 in fakebank
     new c4cc1ea1 -fix 200 vs. 204 in fakebank

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (5ff708d3)
            \
             N -- N -- N   refs/heads/master (c4cc1ea1)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/bank-lib/fakebank.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/bank-lib/fakebank.c b/src/bank-lib/fakebank.c
index 73237811..c067889a 100644
--- a/src/bank-lib/fakebank.c
+++ b/src/bank-lib/fakebank.c
@@ -2257,23 +2257,20 @@ handle_debit_history (struct TALER_FAKEBANK_Handle *h,
     if ( (NULL == t) ||
          overflow)
     {
-      GNUNET_free (debit_payto);
       if (GNUNET_TIME_relative_is_zero (ha.lp_timeout) &&
           (0 < ha.delta))
       {
         GNUNET_assert (0 ==
                        pthread_mutex_unlock (&h->big_lock));
         if (overflow)
+        {
+          GNUNET_free (debit_payto);
           return TALER_MHD_reply_with_ec (
             connection,
             TALER_EC_BANK_ANCIENT_TRANSACTION_GONE,
             NULL);
-        return TALER_MHD_REPLY_JSON_PACK (
-          connection,
-          MHD_HTTP_OK,
-          GNUNET_JSON_pack_array_steal (
-            "outgoing_transactions",
-            history));
+        }
+        goto finish;
       }
       *con_cls = &special_ptr;
       start_lp (h,
@@ -2285,6 +2282,7 @@ handle_debit_history (struct TALER_FAKEBANK_Handle *h,
       GNUNET_assert (0 ==
                      pthread_mutex_unlock (&h->big_lock));
       json_decref (history);
+      GNUNET_free (debit_payto);
       return MHD_YES;
     }
     if (t->debit_account != acc)
@@ -2397,6 +2395,7 @@ handle_debit_history (struct TALER_FAKEBANK_Handle *h,
   }
   GNUNET_assert (0 ==
                  pthread_mutex_unlock (&h->big_lock));
+finish:
   if (0 == json_array_size (history))
   {
     json_decref (history);
@@ -2509,11 +2508,7 @@ handle_credit_history (struct TALER_FAKEBANK_Handle *h,
             connection,
             TALER_EC_BANK_ANCIENT_TRANSACTION_GONE,
             NULL);
-        return TALER_MHD_REPLY_JSON_PACK (connection,
-                                          MHD_HTTP_OK,
-                                          GNUNET_JSON_pack_array_steal (
-                                            "incoming_transactions",
-                                            history));
+        goto finish;
       }
       *con_cls = &special_ptr;
       start_lp (h,
@@ -2617,6 +2612,7 @@ handle_credit_history (struct TALER_FAKEBANK_Handle *h,
   }
   GNUNET_assert (0 ==
                  pthread_mutex_unlock (&h->big_lock));
+finish:
   if (0 == json_array_size (history))
   {
     json_decref (history);

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