[GNUnet-SVN] r10974 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-04-19 13:00:23 +0200 (Mon, 19 Apr 2010)
New Revision: 10974

Modified:
   gnunet/src/fs/gnunet-service-fs_drq.c
   gnunet/src/fs/test_fs_test_lib.c
Log:
fixing shutdown

Modified: gnunet/src/fs/gnunet-service-fs_drq.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_drq.c       2010-04-19 10:39:53 UTC (rev 
10973)
+++ gnunet/src/fs/gnunet-service-fs_drq.c       2010-04-19 11:00:23 UTC (rev 
10974)
@@ -310,11 +310,17 @@
   drq_tail = NULL;
   if (drq_running != NULL)
     {
-      GNUNET_SCHEDULER_cancel (sched,
-                              drq_running->task);
-      drq_running->iter (drq_running->iter_cls,
-                        NULL, 0, NULL, 0, 0, 0, 
-                        GNUNET_TIME_UNIT_ZERO_ABS, 0);
+      if (drq_running->task != GNUNET_SCHEDULER_NO_TASK)
+       {
+         GNUNET_SCHEDULER_cancel (sched,
+                                  drq_running->task);
+       }
+      if (drq_running->iter != NULL)
+       {
+         drq_running->iter (drq_running->iter_cls,
+                            NULL, 0, NULL, 0, 0, 0, 
+                            GNUNET_TIME_UNIT_ZERO_ABS, 0);
+       }
       GNUNET_free (drq_running);
       drq_running = NULL;
     }

Modified: gnunet/src/fs/test_fs_test_lib.c
===================================================================
--- gnunet/src/fs/test_fs_test_lib.c    2010-04-19 10:39:53 UTC (rev 10973)
+++ gnunet/src/fs/test_fs_test_lib.c    2010-04-19 11:00:23 UTC (rev 10974)
@@ -105,6 +105,7 @@
       GNUNET_SCHEDULER_add_now (sched,
                                &do_stop,
                                NULL);
+      return;
     }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Publishing %llu bytes\n",