diff options
| author | Alexander Kutsan <AKutsan@luxoft.com> | 2015-04-06 18:27:05 +0300 |
|---|---|---|
| committer | Alexander Kutsan <AKutsan@luxoft.com> | 2015-04-07 10:21:20 +0300 |
| commit | 48e08bc7408e7371b34042670087fbcb9ea0d915 (patch) | |
| tree | ba5520526333969aad874670937cd26bac37995b /src/components/application_manager/src/request_info.cc | |
| parent | f85f9d79277b89194304d46e3faacaa4de0f797c (diff) | |
| download | sdl_core-48e08bc7408e7371b34042670087fbcb9ea0d915.tar.gz | |
APPLINK-11916 Fix some bugs
Fix Bug in requestCtrl
Fix bug sending HashChange on Success CreateInteractionChoiceSet
Diffstat (limited to 'src/components/application_manager/src/request_info.cc')
| -rw-r--r-- | src/components/application_manager/src/request_info.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/components/application_manager/src/request_info.cc b/src/components/application_manager/src/request_info.cc index dad1539b64..57d48680be 100644 --- a/src/components/application_manager/src/request_info.cc +++ b/src/components/application_manager/src/request_info.cc @@ -192,11 +192,12 @@ RequestInfoPtr RequestInfoSet::FrontWithNotNullTimeout() { RequestInfoPtr result; TimeSortedRequestInfoSet::iterator it = time_sorted_pending_requests_.begin(); while (it != time_sorted_pending_requests_.end()) { - if (0 != (*it)->timeout_sec()) { - result =*it; - it = time_sorted_pending_requests_.end(); - } else { + RequestInfoPtr tmp = *it; + if ( tmp ->timeout_sec() || !tmp->request()->AllowedToTerminate()) { ++it; + } else { + result = tmp; + it = time_sorted_pending_requests_.end(); } } return result; |