[GNUnet-SVN] [taler-exchange] 08/08: merging Florian's changes with my wire changes

[gnunet]

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

grothoff pushed a commit to branch master
in repository exchange.

commit 202827ebdaafdf33b78c202bcbb6917dd65dd1c1
Merge: aea82d3 1b3bf1a
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Apr 15 12:20:00 2018 +0200

    merging Florian's changes with my wire changes

 ChangeLog                                                    |  3 +++
 configure.ac                                                 |  2 +-
 src/bank-lib/bank_api_history.c                              |  2 +-
 src/bank-lib/testing_api_cmd_history.c                       |  3 ++-
 src/exchange-lib/exchange_api_handle.c                       |  4 ++--
 src/exchange-lib/test_exchange_api_keys_cherry_picking.c     |  4 ++++
 src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c |  7 ++++++-
 src/exchange-lib/testing_api_cmd_track.c                     | 11 +++++------
 src/exchange/taler-exchange-wirewatch.c                      | 11 +++++++----
 src/exchangedb/plugin_exchangedb_postgres.c                  |  8 +++++++-
 src/include/taler_exchange_service.h                         |  7 +++++++
 src/wire-plugins/plugin_wire_taler-bank.c                    |  6 +++++-
 12 files changed, 50 insertions(+), 18 deletions(-)

diff --cc src/exchange/taler-exchange-wirewatch.c
index 67fab85,508f8c3..a48634e
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@@ -389,10 -308,12 +389,13 @@@ history_cb (void *cls
                  "End of list. Committing progress!\n");
      qs = db_plugin->commit (db_plugin->cls,
                            session);
+     GNUNET_break (0 <= qs);
      if ( (GNUNET_YES == delay) &&
 -         (test_mode) )
 +         (test_mode) &&
 +         (NULL == wa_pos->next) )
      {
+       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                   "Shutdown due to test mode!\n");
        GNUNET_SCHEDULER_shutdown ();
        return GNUNET_OK;
      }
diff --cc src/wire-plugins/plugin_wire_taler-bank.c
index 2d22353,a81ccda..743d85b
--- a/src/wire-plugins/plugin_wire_taler-bank.c
+++ b/src/wire-plugins/plugin_wire_taler-bank.c
@@@ -905,7 -884,7 +905,11 @@@ bhist_cb (void *cls
                            sizeof (bserial_id),
                            &wd)) )
          whh->hres_cb = NULL;
-       return; /* do NOT yet clean up! */
 -      break;
++      GNUNET_break (NULL != whh->hh);
++      /* Once we get the sentinel element, the handle becomes invalid. */
++      if (TALER_BANK_DIRECTION_NONE == dir)
++        whh->hh = NULL;
++      return;
      }
    case MHD_HTTP_NO_CONTENT:
      if (NULL != whh->hres_cb)

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