Mercurial > hg > orthanc-stone
diff Framework/Toolbox/OrthancAsynchronousWebService.cpp @ 77:f5f54ed8d307 wasm
refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 24 May 2017 21:13:29 +0200 |
parents | 0aef120d7e1c |
children |
line wrap: on
line diff
--- a/Framework/Toolbox/OrthancAsynchronousWebService.cpp Wed May 24 12:42:08 2017 +0200 +++ b/Framework/Toolbox/OrthancAsynchronousWebService.cpp Wed May 24 21:13:29 2017 +0200 @@ -90,6 +90,7 @@ catch (Orthanc::OrthancException&) { callback_.NotifyError(uri_, payload_.release()); + return; } callback_.NotifySuccess(uri_, answer.c_str(), answer.size(), payload_.release()); @@ -220,14 +221,15 @@ for (size_t i = 0; i < threads_.size(); i++) { - assert(threads_[i] != NULL); - - if (threads_[i]->joinable()) + if (threads_[i] != NULL) { - threads_[i]->join(); + if (threads_[i]->joinable()) + { + threads_[i]->join(); + } + + delete threads_[i]; } - - delete threads_[i]; } } };