[GNUnet-SVN] r21731 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2012-06-02 19:00:43 +0200 (Sat, 02 Jun 2012)
New Revision: 21731

Modified:
   gnunet/src/util/server.c
Log:
-hopefully fixing #2390

Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c    2012-06-02 16:58:55 UTC (rev 21730)
+++ gnunet/src/util/server.c    2012-06-02 17:00:43 UTC (rev 21731)
@@ -1389,7 +1389,13 @@
     GNUNET_SERVER_notify_transmit_ready_cancel (&client->th);
   (void) GNUNET_SCHEDULER_add_now (&destroy_connection,
                                   client->connection);
-  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == client->warn_task);
+  /* need to cancel again, as it might have been re-added
+     in the meantime (i.e. during callbacks) */
+  if (GNUNET_SCHEDULER_NO_TASK != client->warn_task)
+  {
+    GNUNET_SCHEDULER_cancel (client->warn_task);
+    client->warn_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   GNUNET_assert (GNUNET_NO == client->receive_pending);
   GNUNET_free (client);
   /* we might be in soft-shutdown, test if we're done */