diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2017-11-22 11:52:54 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-22 11:52:54 -0500 |
commit | 7806a8d50caa5081cf1686e465715b1296d3dfe4 (patch) | |
tree | 04ae1c409778bca961a25b545d790b41090d231a /src/components/application_manager/src | |
parent | 4eb09bf0da82e320723390abd877079af9457d20 (diff) | |
parent | 0455ffa8082861584fdd6857ff55986acb18f352 (diff) | |
download | sdl_core-7806a8d50caa5081cf1686e465715b1296d3dfe4.tar.gz |
Merge pull request #1855 from AKalinich-Luxoft/fix/fix_streaming_retry_sequence_logic
Fix application start streaming retry sequence
Diffstat (limited to 'src/components/application_manager/src')
-rw-r--r-- | src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc | 16 | ||||
-rw-r--r-- | src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc | 16 |
2 files changed, 20 insertions, 12 deletions
diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc index 0bcb26df8a..42b8c64fc0 100644 --- a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc @@ -109,6 +109,8 @@ void AudioStartStreamRequest::on_event(const event_engine::Event& event) { logger_, "StartAudioStreamRequest aborted. Application can not stream"); } + application_manager_.TerminateRequest( + connection_key(), correlation_id(), function_id()); break; } if (hmi_apis::Common_Result::REJECTED == code) { @@ -125,15 +127,16 @@ void AudioStartStreamRequest::on_event(const event_engine::Event& event) { } void AudioStartStreamRequest::onTimeOut() { + LOG4CXX_AUTO_TRACE(logger_); RetryStartSession(); - - application_manager_.TerminateRequest( - connection_key(), correlation_id(), function_id()); } void AudioStartStreamRequest::RetryStartSession() { LOG4CXX_AUTO_TRACE(logger_); + application_manager_.TerminateRequest( + connection_key(), correlation_id(), function_id()); + ApplicationSharedPtr app = application_manager_.application_by_hmi_app(application_id()); if (!app) { @@ -156,10 +159,11 @@ void AudioStartStreamRequest::RetryStartSession() { } uint32_t curr_retry_number = app->audio_stream_retry_number(); + LOG4CXX_DEBUG( + logger_, "Retry number " << curr_retry_number << " of " << retry_number_); + if (curr_retry_number < retry_number_) { - LOG4CXX_DEBUG( - logger_, - "Send AudioStartStream retry. retry_number = " << curr_retry_number); + LOG4CXX_DEBUG(logger_, "Send AudioStartStream retry"); MessageHelper::SendAudioStartStream(app->app_id(), application_manager_); app->set_audio_stream_retry_number(++curr_retry_number); } else { diff --git a/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc index b06c69e703..ffc325b5e4 100644 --- a/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc @@ -109,6 +109,8 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) { logger_, "NaviStartStreamRequest aborted. Application can not stream"); } + application_manager_.TerminateRequest( + connection_key(), correlation_id(), function_id()); break; } if (hmi_apis::Common_Result::REJECTED == code) { @@ -125,15 +127,16 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) { } void NaviStartStreamRequest::onTimeOut() { + LOG4CXX_AUTO_TRACE(logger_); RetryStartSession(); - - application_manager_.TerminateRequest( - connection_key(), correlation_id(), function_id()); } void NaviStartStreamRequest::RetryStartSession() { LOG4CXX_AUTO_TRACE(logger_); + application_manager_.TerminateRequest( + connection_key(), correlation_id(), function_id()); + ApplicationSharedPtr app = application_manager_.application_by_hmi_app(application_id()); if (!app) { @@ -156,10 +159,11 @@ void NaviStartStreamRequest::RetryStartSession() { } uint32_t curr_retry_number = app->video_stream_retry_number(); + LOG4CXX_DEBUG( + logger_, "Retry number " << curr_retry_number << " of " << retry_number_); + if (curr_retry_number < retry_number_) { - LOG4CXX_DEBUG( - logger_, - "Send NaviStartStream retry. retry_number = " << curr_retry_number); + LOG4CXX_DEBUG(logger_, "Send NaviStartStream retry"); MessageHelper::SendNaviStartStream(app->app_id(), application_manager_); app->set_video_stream_retry_number(++curr_retry_number); } else { |