[GNUnet-SVN] r21132 - gnunet/src/statistics

[gnunet]

Author: grothoff
Date: 2012-04-24 15:00:53 +0200 (Tue, 24 Apr 2012)
New Revision: 21132

Modified:
   gnunet/src/statistics/statistics_api.c
Log:
-simplify logic, connections no longer die during shutdown

Modified: gnunet/src/statistics/statistics_api.c
===================================================================
--- gnunet/src/statistics/statistics_api.c      2012-04-24 12:51:16 UTC (rev 
21131)
+++ gnunet/src/statistics/statistics_api.c      2012-04-24 13:00:53 UTC (rev 
21132)
@@ -907,22 +907,15 @@
                                   h->action_tail,
                                   h->current);
     h->do_destroy = GNUNET_YES;
-    if ((h->current != NULL) && (h->th == NULL))
+    if ((h->current != NULL) && (h->th == NULL)&&
+       (NULL != h->client))
     {
-      if (NULL == h->client)
-      {
-       /* instant-connect (regardless of back-off) to submit final value */
-       h->client = GNUNET_CLIENT_connect ("statistics", h->cfg);
-      }
-      if (NULL != h->client)
-      {
-       timeout = GNUNET_TIME_absolute_get_remaining (h->current->timeout);
-       h->th =
-          GNUNET_CLIENT_notify_transmit_ready (h->client, h->current->msize,
-                                               timeout, GNUNET_YES,
-                                               &transmit_action, h);
-       GNUNET_assert (NULL != h->th);
-      }
+      timeout = GNUNET_TIME_absolute_get_remaining (h->current->timeout);
+      h->th =
+       GNUNET_CLIENT_notify_transmit_ready (h->client, h->current->msize,
+                                            timeout, GNUNET_YES,
+                                            &transmit_action, h);
+      GNUNET_assert (NULL != h->th);      
     }
     if (h->th != NULL)
       return; /* do not finish destruction just yet */