summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Nosach <ANosach@luxoft.com>2015-05-22 10:45:55 +0300
committerArtem Nosach <ANosach@luxoft.com>2015-06-23 17:07:33 +0300
commitcc702c4db9e95b092faf8fa54b3edbee17091d2a (patch)
tree868a05e35cb33bfb8b3d05eeb3457af70aea9f08
parente03769c950d8cd9071855cee7c7505eac0f43e2f (diff)
downloadsmartdevicelink-cc702c4db9e95b092faf8fa54b3edbee17091d2a.tar.gz
Post review changes.
-rw-r--r--src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc7
1 files changed, 3 insertions, 4 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 ff793ee29..9908756cf 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
@@ -366,7 +366,7 @@ void CreateInteractionChoiceSetRequest::on_event(
[strings::correlation_id].asUInt());
SentCommandsMap::iterator it = sent_commands_map_.find(corr_id);
if (sent_commands_map_.end() == it) {
- LOG4CXX_DEBUG(logger_, "HMI response for unknown VR command received");
+ LOG4CXX_WARN(logger_, "HMI response for unknown VR command received");
return;
}
@@ -377,7 +377,7 @@ void CreateInteractionChoiceSetRequest::on_event(
vr_command.succesful_response_received_ = true;
} else {
LOG4CXX_DEBUG(logger_, "Hmi response is not Success: " << vr_result_
- << ". Stop sending VRAAdcommands");
+ << ". Stop sending VRAddCommand requests");
sync_primitives::AutoLock error_lock(error_from_hmi_lock_);
if (!error_from_hmi_) {
error_from_hmi_ = true;
@@ -410,6 +410,7 @@ void CreateInteractionChoiceSetRequest::onTimeOut() {
}
// We have to keep request alive until receive all responses from HMI
+ // according to SDLAQ-CRS-2976
sync_primitives::AutoLock timeout_lock_(is_timed_out_lock_);
is_timed_out_ = true;
ApplicationManagerImpl::instance()->updateRequestTimeout(
@@ -419,7 +420,6 @@ void CreateInteractionChoiceSetRequest::onTimeOut() {
void CreateInteractionChoiceSetRequest::DeleteChoices() {
LOG4CXX_AUTO_TRACE(logger_);
- DCHECK_OR_RETURN_VOID(ApplicationManagerImpl::instance());
ApplicationSharedPtr application =
ApplicationManagerImpl::instance()->application(connection_key());
if (!application) {
@@ -449,7 +449,6 @@ void CreateInteractionChoiceSetRequest::DeleteChoices() {
void CreateInteractionChoiceSetRequest::OnAllHMIResponsesReceived() {
LOG4CXX_AUTO_TRACE(logger_);
- DCHECK_OR_RETURN_VOID(ApplicationManagerImpl::instance());
if (!error_from_hmi_) {
SendResponse(true, mobile_apis::Result::SUCCESS);