fix stopping condition

fastmachinelearning · Sep 18, 2018 · 9b847af · 9b847af
1 parent 638b206
commit 9b847af
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/AnalysisFW/src/TFClientRemote.cc b/AnalysisFW/src/TFClientRemote.cc
@@ -34,20 +34,22 @@ JetImageData::JetImageData() :
 
 JetImageData::~JetImageData() {
 	stop_ = true;
+	cond_.notify_one();
 	if(thread_){
 		thread_->join();
 		thread_.reset();
 	}
 }
 
 void JetImageData::waitForNext(){
-	while(!stop_){
+	while(true){
 		//wait for condition
 		{
 			std::unique_lock<std::mutex> lk(mutex_);
-			cond_.wait(lk, [this](){return hasCall_;});
+			cond_.wait(lk, [this](){return (hasCall_ or stop_);});
 			lk.unlock();
 		}
+		if(stop_) break;
 
 		//items for grpc request
 		PredictRequest request;