From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 23 Dec 2010 13:23:11 +0000 (+0000)
Subject: fix shutdown order
X-Git-Tag: initial-import-from-subversion-38251~19413
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ba204d8d7f0dc98c5b50d047cb5e081f73d67d2e;p=oweals%2Fgnunet.git

fix shutdown order
---

diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 08e864a10..20d5cf865 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -2080,6 +2080,9 @@ shutdown_task (void *cls,
     handle_client_disconnect (NULL,
 			      client_list->client);
   cron_flush_trust (NULL, NULL);
+  GNUNET_assert (NULL != core);
+  GNUNET_CORE_disconnect (core);
+  core = NULL;
   GNUNET_CONTAINER_multihashmap_iterate (connected_peers,
 					 &clean_peer,
 					 NULL);
@@ -2096,9 +2099,6 @@ shutdown_task (void *cls,
   GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_size (peer_request_map));
   GNUNET_CONTAINER_multihashmap_destroy (peer_request_map);
   peer_request_map = NULL;
-  GNUNET_assert (NULL != core);
-  GNUNET_CORE_disconnect (core);
-  core = NULL;
   if (stats != NULL)
     {
       GNUNET_STATISTICS_destroy (stats, GNUNET_NO);