From: sangorrin Date: Tue, 25 Nov 2008 19:09:02 +0000 (+0000) Subject: bug: the case when the contract failed wasnt addressed X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/fna.git/commitdiff_plain/5f40b91996a8aa29ee1cf5e5e1d1a1a44890638d bug: the case when the contract failed wasnt addressed git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1436 35b4ef3e-fd22-0410-ab77-dab3279adceb --- diff --git a/src_frescan/frescan_bwres_threads.c b/src_frescan/frescan_bwres_threads.c index 111985c..775d791 100644 --- a/src_frescan/frescan_bwres_threads.c +++ b/src_frescan/frescan_bwres_threads.c @@ -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; iss_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; iss_new->size; i++) { + caller_req->ss_new->ss[i] = req_data->ss_new->ss[i]; + } } ret = frescan_bwres_robjs_signal(caller_req->robj);