From 2d95d30926018bfbf0236b9c8bb89c763222cbba Mon Sep 17 00:00:00 2001 From: Shobhit Adlakha Date: Thu, 25 Aug 2022 14:31:12 -0400 Subject: Core dump on ignition off when registering 20 apps (#3939) * Add changes from luxoft PR * Address review comments * Apply suggestions from code review Co-authored-by: Jacob Keeler * Address review comments * Use sync_primitives::RecursiveLock instead of sync_primitives::Lock for extensions_lock_ Co-authored-by: Jacob Keeler --- .../include/application_manager/application_impl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/components/application_manager/include/application_manager/application_impl.h') diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h index 49f44acacb..1746893be3 100644 --- a/src/components/application_manager/include/application_manager/application_impl.h +++ b/src/components/application_manager/include/application_manager/application_impl.h @@ -555,7 +555,7 @@ class ApplicationImpl : public virtual Application, */ bool RemoveExtension(AppExtensionUID uid) OVERRIDE; - const std::list& Extensions() const OVERRIDE; + const DataAccessor > Extensions() const OVERRIDE; std::string hash_val_; uint32_t grammar_id_; @@ -617,6 +617,7 @@ class ApplicationImpl : public virtual Application, Timer audio_stream_suspend_timer_; std::list extensions_; + mutable std::shared_ptr extensions_lock_; // Cloud app properties std::string endpoint_; @@ -644,7 +645,6 @@ class ApplicationImpl : public virtual Application, CommandSoftButtonID cmd_softbuttonid_; // Lock for command soft button id sync_primitives::Lock cmd_softbuttonid_lock_; - mutable std::shared_ptr vi_lock_ptr_; mutable std::shared_ptr button_lock_ptr_; std::string folder_name_; ApplicationManager& application_manager_; -- cgit v1.2.1