summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/components/application_manager/include/application_manager/request_controller.h2
-rw-r--r--src/components/application_manager/src/request_controller.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/components/application_manager/include/application_manager/request_controller.h b/src/components/application_manager/include/application_manager/request_controller.h
index d25b1751bc..3dca8c303b 100644
--- a/src/components/application_manager/include/application_manager/request_controller.h
+++ b/src/components/application_manager/include/application_manager/request_controller.h
@@ -284,7 +284,7 @@ class RequestController {
/*
* Timer for lock
*/
- bool stop_flag_;
+ volatile bool timer_stop_flag_;
sync_primitives::Lock timer_lock;
sync_primitives::ConditionalVariable timer_condition_;
diff --git a/src/components/application_manager/src/request_controller.cc b/src/components/application_manager/src/request_controller.cc
index 6bef0f341b..e3366b8d7a 100644
--- a/src/components/application_manager/src/request_controller.cc
+++ b/src/components/application_manager/src/request_controller.cc
@@ -52,7 +52,7 @@ RequestController::RequestController(const RequestControlerSettings& settings)
, timer_("AM RequestCtrlTimer",
new timer::TimerTaskImpl<RequestController>(
this, &RequestController::onTimer))
- , stop_flag_(false)
+ , timer_stop_flag_(false)
, is_low_voltage_(false)
, settings_(settings) {
LOG4CXX_AUTO_TRACE(logger_);
@@ -62,7 +62,7 @@ RequestController::RequestController(const RequestControlerSettings& settings)
RequestController::~RequestController() {
LOG4CXX_AUTO_TRACE(logger_);
- stop_flag_ = true;
+ timer_stop_flag_ = true;
timer_condition_.Broadcast();
timer_.Stop();
if (pool_state_ != TPoolState::STOPPED) {
@@ -377,7 +377,7 @@ void RequestController::onTimer() {
LOG4CXX_DEBUG(
logger_,
"ENTER Waiting fore response count: " << waiting_for_response_.Size());
- while(!stop_flag_) {
+ while(!timer_stop_flag_) {
RequestInfoPtr probably_expired =
waiting_for_response_.FrontWithNotNullTimeout();
if (!probably_expired) {