1 files changed, 20 insertions, 18 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc
index bac700f89c..7753c16acf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc
@@ -163,18 +163,18 @@ void PerformInteractionRequest::Run() {
     SendResponse(false, mobile_apis::Result::INVALID_ID);
     return;
   }
-  if (!CheckChoiceSetList_VRCommands(
-          app,
-          choice_set_id_list_length,
-          msg_params[strings::interaction_choice_set_id_list])) {
-    LOG4CXX_ERROR(logger_,
-                  "PerformInteraction has choice sets with "
-                  "missing vrCommands");
-    SendResponse(false,
-                 mobile_apis::Result::INVALID_DATA,
-                 "Some choices don't contain VR commands.");
-    return;
-  }
+  // if (!CheckChoiceSetList_VRCommands(
+  //         app,
+  //         choice_set_id_list_length,
+  //         msg_params[strings::interaction_choice_set_id_list])) {
+  //   LOG4CXX_ERROR(logger_,
+  //                 "PerformInteraction has choice sets with "
+  //                 "missing vrCommands");
+  //   SendResponse(false,
+  //                mobile_apis::Result::INVALID_DATA,
+  //                "Some choices don't contain VR commands.");
+  //   return;
+  // }
   if (msg_params.keyExists(strings::vr_help)) {
     if (mobile_apis::Result::SUCCESS !=
         MessageHelper::VerifyImageVrHelpItems(
@@ -965,17 +965,19 @@ bool PerformInteractionRequest::CheckChoiceSetList_VRCommands(
 
   for (size_t i = 0; i < choice_set_id_list_length; ++i) {
     choice_set = app->FindChoiceSet(choice_set_id_list[i].asInt());
-    if (!choice_set) {
-      LOG4CXX_ERROR(
-          logger_,
-          "Couldn't find choiceset_id = " << choice_set_id_list[i].asInt());
-      return false;
-    }
+    // this should never ever happen
+    // if (!choice_set) {
+    //   LOG4CXX_ERROR(
+    //       logger_,
+    //       "Couldn't find choiceset_id = " << choice_set_id_list[i].asInt());
+    //   return false;
+    // }
     
     
     int vr_status = MessageHelper::CheckChoiceSet_VRCommands(*choice_set);
     // if not all choices have vr commands
     if (vr_status != 0) {
+      std::cerr << "choice set has member missing vr commands\n";
       return false;
     }
   }