diff options
| -rw-r--r-- | src/components/application_manager/include/application_manager/state_controller_impl.h | 15 | ||||
| -rw-r--r-- | src/components/application_manager/src/state_controller_impl.cc | 1 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/components/application_manager/include/application_manager/state_controller_impl.h b/src/components/application_manager/include/application_manager/state_controller_impl.h index 000569e450..c6121f5d1d 100644 --- a/src/components/application_manager/include/application_manager/state_controller_impl.h +++ b/src/components/application_manager/include/application_manager/state_controller_impl.h @@ -152,13 +152,14 @@ class StateControllerImpl : public event_engine::EventObserver, template <typename UnaryFunction> void ForEachApplication(UnaryFunction func) const { - DataAccessor<ApplicationSet> accessor = app_mngr_.applications(); - ApplicationSet::iterator it = accessor.GetData().begin(); - for (; it != accessor.GetData().end(); ++it) { - ApplicationConstSharedPtr const_app = *it; - if (const_app) { - func(app_mngr_.application(const_app->app_id())); - } + ApplicationSet applications; + { + DataAccessor<ApplicationSet> accessor = app_mngr_.applications(); + applications = accessor.GetData(); + } + + for (const auto& app : applications) { + func(app); } } diff --git a/src/components/application_manager/src/state_controller_impl.cc b/src/components/application_manager/src/state_controller_impl.cc index 1bf4c2bf66..b07a5bcc13 100644 --- a/src/components/application_manager/src/state_controller_impl.cc +++ b/src/components/application_manager/src/state_controller_impl.cc @@ -976,6 +976,7 @@ int64_t StateControllerImpl::RequestHMIStateChange( void StateControllerImpl::ApplyPostponedStateForApp(ApplicationSharedPtr app) { LOG4CXX_AUTO_TRACE(logger_); + DCHECK_OR_RETURN_VOID(app); const WindowIds window_ids = app->GetWindowIds(); for (const auto& window_id : window_ids) { |