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

[gnunet]

Author: grothoff
Date: 2012-05-09 22:28:06 +0200 (Wed, 09 May 2012)
New Revision: 21397

Modified:
   gnunet/src/util/server.c
Log:
-trying to fix #2335

Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c    2012-05-09 20:03:45 UTC (rev 21396)
+++ gnunet/src/util/server.c    2012-05-09 20:28:06 UTC (rev 21397)
@@ -1046,6 +1046,7 @@
 {
   struct GNUNET_SERVER_Client *client = cls;
 
+  GNUNET_assert (GNUNET_YES != client->shutdown_now);
   client->restart_task = GNUNET_SCHEDULER_NO_TASK;
   if (GNUNET_NO == client->receive_pending)
   {
@@ -1488,7 +1489,7 @@
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "GNUNET_SERVER_receive_done called with failure indication\n");
-    if (client->reference_count > 0)
+    if ( (client->reference_count > 0) || (client->suspended > 0) )
       client->shutdown_now = GNUNET_YES;
     else
       GNUNET_SERVER_client_disconnect (client);