APPLINK-11916 Fix some bugs

Fix Bug in requestCtrl
Fix bug sending HashChange  on Success CreateInteractionChoiceSet

2 files changed, 11 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 3aa988b9b0..28ad8a3d53 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
@@ -413,6 +413,12 @@ void CreateInteractionChoiceSetRequest::OnAllHMIResponsesReceived() {
     DeleteChoices();
   } else {
     SendResponse(true, mobile_apis::Result::SUCCESS);
+    ApplicationSharedPtr application =
+      ApplicationManagerImpl::instance()->application(connection_key());
+    if (!application) {
+      return;
+    }
+    application->UpdateHash();
   }
   ApplicationManagerImpl::instance()->TerminateRequest(connection_key(),
                                                        correlation_id());
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;