[GNUnet-SVN] [taler-exchange] branch master updated (111f8f2 -> f8d7c1e)

[gnunet]

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

dold pushed a change to branch master
in repository exchange.

    from 111f8f2  url joining: grow strings correctly
     new b6b7a36  wirewatch: fix uninitialized offset variable, logging
     new f8d7c1e  wirewatch: no need to do rollback on hard/soft error

The 2 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/exchange/taler-exchange-wirewatch.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/exchange/taler-exchange-wirewatch.c 
b/src/exchange/taler-exchange-wirewatch.c
index e45b424..f28c800 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -306,6 +306,9 @@ history_cb (void *cls,
   enum GNUNET_DB_QueryStatus qs;
   struct TALER_ReservePublicKeyP reserve_pub;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Got history callback, direction %u!\n", (unsigned int) dir);
+
   if (TALER_BANK_DIRECTION_NONE == dir)
   {
     hh = NULL;
@@ -353,6 +356,7 @@ history_cb (void *cls,
     {
       GNUNET_free_non_null (last_row_off);
       last_row_off = GNUNET_malloc (row_off_size);
+      last_row_off_size = row_off_size;
     }
     memcpy (last_row_off,
             row_off,
@@ -388,15 +392,13 @@ history_cb (void *cls,
   if (GNUNET_DB_STATUS_HARD_ERROR == qs)
   {
     GNUNET_break (0);
-    db_plugin->rollback (db_plugin->cls,
-                        session);
     GNUNET_SCHEDULER_shutdown ();
     return GNUNET_SYSERR;
   }
   if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
   {
-    db_plugin->rollback (db_plugin->cls,
-                         session);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Got DB soft error for reserve_in_insert\n");
     /* try again */
     task = GNUNET_SCHEDULER_add_now (&find_transfers,
                                     NULL);
@@ -465,13 +467,12 @@ find_transfers (void *cls)
     if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
     {
       /* try again */
-      db_plugin->rollback (db_plugin->cls,
-                           session);
       task = GNUNET_SCHEDULER_add_now (&find_transfers,
                                        NULL);
       return;
     }
   }
+  GNUNET_assert ((NULL == start_off) || ((NULL != start_off) && 
(start_off_size != 0)));
   delay = GNUNET_YES;
   hh = wire_plugin->get_history (wire_plugin->cls,
                                 TALER_BANK_DIRECTION_CREDIT,

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