summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Oleynik (GitHub) <aoleynik@luxoft.com>2017-12-08 12:02:23 +0200
committerAndriy Byzhynar <AByzhynar@luxoft.com>2018-01-18 12:03:51 +0200
commitf5582e85acd8081a0d8a08d738e0dba39d9a4672 (patch)
tree215f01e9784d5bbc02c94e887669707250201a37
parentff03d26be902584fc81a6c1701f57489c86f8ccf (diff)
downloadsdl_core-f5582e85acd8081a0d8a08d738e0dba39d9a4672.tar.gz
Revert "Changes return codes for application id replacement"
This reverts commit 866dfe849471157d6d0b414cfb013198a879a51f. Returning false in case of inner app_id fields update failed causes many issues on exisiting logic and ATF scripts.
-rw-r--r--src/components/application_manager/src/commands/command_impl.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/components/application_manager/src/commands/command_impl.cc b/src/components/application_manager/src/commands/command_impl.cc
index 38fe980cce..5251c9e122 100644
--- a/src/components/application_manager/src/commands/command_impl.cc
+++ b/src/components/application_manager/src/commands/command_impl.cc
@@ -115,7 +115,7 @@ bool CommandImpl::ReplaceMobileWithHMIAppId(
smart_objects::SmartArray::iterator it = message_array->begin();
for (; it != message_array->end(); ++it) {
if (!ReplaceMobileWithHMIAppId(*it)) {
- return false;
+ break;
}
}
break;
@@ -126,7 +126,7 @@ bool CommandImpl::ReplaceMobileWithHMIAppId(
for (; key != keys.end(); ++key) {
std::string k = *key;
if (!ReplaceMobileWithHMIAppId(message[*key])) {
- return false;
+ break;
}
}
break;
@@ -198,7 +198,7 @@ bool CommandImpl::ReplaceHMIWithMobileAppId(
smart_objects::SmartArray::iterator it = message_array->begin();
for (; it != message_array->end(); ++it) {
if (!ReplaceHMIWithMobileAppId(*it)) {
- return false;
+ break;
}
}
break;
@@ -208,7 +208,7 @@ bool CommandImpl::ReplaceHMIWithMobileAppId(
std::set<std::string>::const_iterator key = keys.begin();
for (; key != keys.end(); ++key) {
if (!ReplaceHMIWithMobileAppId(message[*key])) {
- return false;
+ break;
}
}
break;