Skip to content
Snippets Groups Projects
Commit 099dbdb7 authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'bugs-4815' into 'release-2.9'

bugs-4815

See merge request !313
parents 7a1c46b4 f065261b
No related branches found
No related tags found
3 merge requests!330features-4787,!326Release 2.9,!313bugs-4815
Pipeline #7725 passed with stage
in 8 seconds
...@@ -2,7 +2,7 @@ project(cellframe-sdk C) ...@@ -2,7 +2,7 @@ project(cellframe-sdk C)
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
set(CELLFRAME_SDK_NATIVE_VERSION "2.9-8") set(CELLFRAME_SDK_NATIVE_VERSION "2.9-9")
add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"") add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
set(DAPSDK_MODULES "") set(DAPSDK_MODULES "")
message("Cellframe modules: ${CELLFRAME_MODULES}") message("Cellframe modules: ${CELLFRAME_MODULES}")
......
...@@ -244,8 +244,6 @@ static void s_go_stage_on_client_worker_unsafe(dap_worker_t * a_worker,void * a_ ...@@ -244,8 +244,6 @@ static void s_go_stage_on_client_worker_unsafe(dap_worker_t * a_worker,void * a_
return; return;
} }
dap_client_stage_t l_cur_stage = l_client_pvt->stage; dap_client_stage_t l_cur_stage = l_client_pvt->stage;
dap_client_stage_status_t l_cur_stage_status= l_client_pvt->stage_status; dap_client_stage_status_t l_cur_stage_status= l_client_pvt->stage_status;
if (l_stage_target == l_cur_stage){ if (l_stage_target == l_cur_stage){
......
...@@ -875,14 +875,18 @@ static void s_request_response(void * a_response, size_t a_response_size, void * ...@@ -875,14 +875,18 @@ static void s_request_response(void * a_response, size_t a_response_size, void *
log_it(L_ERROR,"Client internal is NULL for s_request_response"); log_it(L_ERROR,"Client internal is NULL for s_request_response");
else else
log_it(L_ERROR,"Client is NULL for s_request_response"); log_it(L_ERROR,"Client is NULL for s_request_response");
dap_client_pvt_hh_unlock();
return; return;
} }
l_client_pvt->refs_count--; l_client_pvt->refs_count--;
if (l_client_pvt->is_to_delete){ if (l_client_pvt->is_to_delete){
if(l_client_pvt->refs_count==0) // Was requested to delete until we was working with request if(l_client_pvt->refs_count==0) {// Was requested to delete until we was working with request
dap_client_pvt_hh_unlock();
dap_client_delete_unsafe(l_client_pvt->client); // Init delete dap_client_delete_unsafe(l_client_pvt->client); // Init delete
return;
}
dap_client_pvt_hh_unlock();
return; return;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment