reorder

diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index d62ee8c983b86b3db080ac3caaa9203b6cce9735..7ca0166a162d0fdc761b44cc08cbbdad09ce4ade 100644 (file)
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -46,7 +46,7 @@ DEBUG = YES
 PORT = 43471
 HOSTNAME = localhost
 DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
+PREFIX = valgrind --tool=memcheck --leak-check=yes
 #BINARY = /home/grothoff/bin/gnunet-service-fs
 #PREFIX = xterm -e gdb -x cmd --args 
 

diff --git a/src/fs/gnunet-service-fs_drq.c b/src/fs/gnunet-service-fs_drq.c
index 29b2dca8273dfa595eacd7f8bb815a254ce0daa1..fd5614606a2b3607adccad4022e82bf52617b365 100644 (file)
--- a/src/fs/gnunet-service-fs_drq.c
+++ b/src/fs/gnunet-service-fs_drq.c
@@ -324,10 +324,11 @@ get_iterator (void *cls,
 {
   struct GetClosure *gc = cls;
 
-  if (gc->iter == NULL)
+  if (gc->iter == NULL) 
     {
       /* stop the iteration */
-      GNUNET_DATASTORE_get_next (dsh, GNUNET_NO);
+      if (key != NULL)
+       GNUNET_DATASTORE_get_next (dsh, GNUNET_NO);
     }
   else
     {

diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index 3a4f082492bd022a2b9975168e6cbdea6cdf1541..715d5b44273b2cbbc2dfc61bedfe165e52ca1a0a 100644 (file)
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -51,13 +51,13 @@ static void
 do_stop (void *cls,
         const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  GNUNET_FS_TEST_daemons_stop (sched,
+                              NUM_DAEMONS,
+                              daemons);
   GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Finished download, shutting down\n",
              (unsigned long long) FILESIZE);
-  GNUNET_FS_TEST_daemons_stop (sched,
-                              NUM_DAEMONS,
-                              daemons);
 }