diff options
author | Andrey Oleynik <aoleynik@luxoft.com> | 2015-08-27 14:19:42 +0300 |
---|---|---|
committer | Andrey Oleynik <aoleynik@luxoft.com> | 2015-08-28 13:42:52 +0300 |
commit | 9994e7431284ce9a21f088b40cb7531023e1164d (patch) | |
tree | b9449d8e81dca9ab042846cd8e4698ee3510f233 /src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc | |
parent | f261a06bbfb133d1662943e3b269906fa1fc0a5a (diff) | |
download | sdl_core-9994e7431284ce9a21f088b40cb7531023e1164d.tar.gz |
Fixes sending of OnHashChange notification
By requirements SDL has to send OnHashChange only for successful
responses
Fixes: APPLINK-13033
Conflicts:
src/appMain/life_cycle.cc
src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc
src/components/application_manager/src/commands/mobile/set_global_properties_request.cc
src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc
Diffstat (limited to 'src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc')
-rw-r--r-- | src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc index 9908756cfc..813f550919 100644 --- a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc +++ b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc @@ -423,6 +423,7 @@ void CreateInteractionChoiceSetRequest::DeleteChoices() { ApplicationSharedPtr application = ApplicationManagerImpl::instance()->application(connection_key()); if (!application) { + LOG4CXX_ERROR(logger_, "NULL pointer"); return; } application->RemoveChoiceSet(choice_set_id_); @@ -454,9 +455,11 @@ void CreateInteractionChoiceSetRequest::OnAllHMIResponsesReceived() { ApplicationSharedPtr application = ApplicationManagerImpl::instance()->application(connection_key()); - if (application) { - application->UpdateHash(); + if (!application) { + LOG4CXX_ERROR(logger_, "NULL pointer"); + return; } + application->UpdateHash(); } else { DeleteChoices(); } |