]> rtime.felk.cvut.cz Git - frescor/fna.git/commitdiff
bug: the case when the contract failed wasnt addressed
authorsangorrin <sangorrin@35b4ef3e-fd22-0410-ab77-dab3279adceb>
Tue, 25 Nov 2008 19:09:02 +0000 (19:09 +0000)
committersangorrin <sangorrin@35b4ef3e-fd22-0410-ab77-dab3279adceb>
Tue, 25 Nov 2008 19:09:02 +0000 (19:09 +0000)
git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1436 35b4ef3e-fd22-0410-ab77-dab3279adceb

src_frescan/frescan_bwres_threads.c

index 111985c2cecb42363f264c9dec4be0b4df89f90d..775d791653f000c0bfcb9b59d51120ecbc29d9af 100644 (file)
@@ -428,16 +428,23 @@ static void frescan_manager_rep_gn(frescan_bwres_request_data_t *req_data)
         assert(ret == 0);
 
         caller_req->return_value = req_data->return_value;
-        assert (req_data->ss_new->size == caller_req->contracts_to_neg->size);
-        caller_req->ss_new->size = req_data->ss_new->size;
 
         DEBUG(FRESCAN_BWRES_MANAGER_ENABLE_DEBUG,
-              "ret:%d ss_new->size:%u\n",
-              req_data->return_value,
-              caller_req->ss_new->size);
+              "ret:%d -> %s\n", req_data->return_value,
+              (req_data->return_value ==
+               FRESCAN_BWRES_REQ_ACCEPTED) ? "OK" : "FAIL");
 
-        for (i=0; i<caller_req->ss_new->size; i++) {
-                caller_req->ss_new->ss[i] = req_data->ss_new->ss[i];
+        if (req_data->return_value == FRESCAN_BWRES_REQ_ACCEPTED) {
+                assert (req_data->ss_new->size ==
+                        caller_req->contracts_to_neg->size);
+                caller_req->ss_new->size = req_data->ss_new->size;
+
+                DEBUG(FRESCAN_BWRES_MANAGER_ENABLE_DEBUG,
+                      "ss_new->size:%u\n", caller_req->ss_new->size);
+
+                for (i=0; i<caller_req->ss_new->size; i++) {
+                        caller_req->ss_new->ss[i] = req_data->ss_new->ss[i];
+                }
         }
 
         ret = frescan_bwres_robjs_signal(caller_req->robj);