Merge branch '2.1' into 2.2

2018-01-05 09:58:10 +02:00
parent a91b857a43 583c63e7e1
commit bed0b850b1
5 changed files with 20 additions and 8 deletions
--- a/server/core/skygw_utils.cc
+++ b/server/core/skygw_utils.cc
@ -318,7 +318,9 @@ bool skygw_thread_set_exitflag(skygw_thread_t* thr, skygw_message_t* sendmes,
        skygw_message_wait(recmes);
    }

+    ss_dassert(simple_mutex_lock(thr->sth_mutex, true) == 0);
    ss_dassert(thr->sth_state == THR_STOPPED);
+    ss_dassert(simple_mutex_unlock(thr->sth_mutex) == 0);

 return_succp:
    return succp;