[GNUnet-SVN] r15667 - gnunet/src/datastore

[gnunet]

Author: grothoff
Date: 2011-06-16 15:30:01 +0200 (Thu, 16 Jun 2011)
New Revision: 15667

Modified:
   gnunet/src/datastore/datastore_api.c
Log:
fix

Modified: gnunet/src/datastore/datastore_api.c
===================================================================
--- gnunet/src/datastore/datastore_api.c        2011-06-16 13:13:35 UTC (rev 
15666)
+++ gnunet/src/datastore/datastore_api.c        2011-06-16 13:30:01 UTC (rev 
15667)
@@ -795,16 +795,14 @@
     {      
       was_transmitted = qe->was_transmitted;
       free_queue_entry (qe);
-      if (NULL == h->client)
-       return; /* forced disconnect */
+      if (was_transmitted == GNUNET_YES)
+       do_disconnect (h);
+      else
+       process_queue (h);
       if (rc.cont != NULL)
        rc.cont (rc.cont_cls, 
                 GNUNET_SYSERR,
                 _("Failed to receive status response from database."));
-      if (was_transmitted == GNUNET_YES)
-       do_disconnect (h);
-      else
-       process_queue (h);
       return;
     }
   GNUNET_assert (GNUNET_YES == qe->was_transmitted);
@@ -1256,20 +1254,22 @@
     {
       qe = h->queue_head;
       GNUNET_assert (NULL != qe);
+      rc = qe->qc.rc;
+      free_queue_entry (qe);
       if (qe->was_transmitted == GNUNET_YES)
        {
-         rc = qe->qc.rc;
          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                      _("Failed to receive response from database.\n"));
          do_disconnect (h);
-         free_queue_entry (qe);
-         if (rc.proc != NULL)
-           rc.proc (rc.proc_cls,
-                    NULL, 0, NULL, 0, 0, 0, 
-                    GNUNET_TIME_UNIT_ZERO_ABS, 0);    
        }
       else
-       process_queue (h);
+       {
+         process_queue (h);
+       }
+      if (rc.proc != NULL)
+       rc.proc (rc.proc_cls,
+                NULL, 0, NULL, 0, 0, 0, 
+                GNUNET_TIME_UNIT_ZERO_ABS, 0);         
       return;
     }
   if (ntohs(msg->type) == GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END)