[GNUnet-SVN] r26849 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2013-04-11 15:40:36 +0200 (Thu, 11 Apr 2013)
New Revision: 26849

Modified:
   gnunet/src/testbed/testbed_api_operations.c
Log:
- fix #2862


Modified: gnunet/src/testbed/testbed_api_operations.c
===================================================================
--- gnunet/src/testbed/testbed_api_operations.c 2013-04-11 13:30:30 UTC (rev 
26848)
+++ gnunet/src/testbed/testbed_api_operations.c 2013-04-11 13:40:36 UTC (rev 
26849)
@@ -463,12 +463,17 @@
 
   GNUNET_assert (NULL != (op = entry->op));
   GNUNET_assert (0 < (need = entry->nres));
-  GNUNET_assert (opq->active <= opq->max_active);
   ops = NULL;
   n_ops = 0;
   evict_entries = NULL;
   n_evict_entries = 0;
-  rval = GNUNET_OK;
+  rval = GNUNET_YES;
+  if (opq->active > opq->max_active)
+  {
+    need += opq->active - opq->max_active;
+    rval = GNUNET_NO;
+    goto ret;
+  }
   if ((opq->active + need) <= opq->max_active)
     goto ret;
   deficit = need - (opq->max_active - opq->active);