From 5d57a9568418b33088327abd4a8410f82eaffc76 Mon Sep 17 00:00:00 2001 From: Oleksandr Date: Mon, 11 Jul 2016 15:51:59 +0300 Subject: Change process of json validation In case if json file contain already registered application SDL won't fail validation and will send UpdateAppList to HMI with registered applications + applications from query json Related to APPLINK-25408 --- .../application_manager/src/commands/mobile/system_request.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/application_manager/src/commands/mobile/system_request.cc b/src/components/application_manager/src/commands/mobile/system_request.cc index cd2418f52e..d411340a4f 100644 --- a/src/components/application_manager/src/commands/mobile/system_request.cc +++ b/src/components/application_manager/src/commands/mobile/system_request.cc @@ -224,11 +224,9 @@ class QueryAppsDataValidator { ApplicationSharedPtr registered_app = manager_.application_by_policy_id(app_id); if (registered_app) { - LOG4CXX_WARN(logger_, - kQueryAppsValidationFailedPrefix - << "Application with the same id: " << app_id - << " is registered already."); - return false; + LOG4CXX_INFO(logger_, + "Application with the same id: " + << app_id << " is registered already."); } // Verify app name exist if (!app_data.keyExists(json::name)) { -- cgit v1.2.1 From 8ba7a97207a9de4c17043675d268231cae3e9e4b Mon Sep 17 00:00:00 2001 From: Oleksandr Date: Mon, 11 Jul 2016 16:25:07 +0300 Subject: Resolve issue with coding style Resolved issue with coding style Related to APPLINK-25408 --- .../application_manager/src/commands/mobile/system_request.cc | 4 ++-- src/components/policy/src/sql_pt_representation.cc | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/application_manager/src/commands/mobile/system_request.cc b/src/components/application_manager/src/commands/mobile/system_request.cc index d411340a4f..9b8050e28b 100644 --- a/src/components/application_manager/src/commands/mobile/system_request.cc +++ b/src/components/application_manager/src/commands/mobile/system_request.cc @@ -225,8 +225,8 @@ class QueryAppsDataValidator { manager_.application_by_policy_id(app_id); if (registered_app) { LOG4CXX_INFO(logger_, - "Application with the same id: " - << app_id << " is registered already."); + "Application with the id: " << app_id + << " is already registered."); } // Verify app name exist if (!app_data.keyExists(json::name)) { diff --git a/src/components/policy/src/sql_pt_representation.cc b/src/components/policy/src/sql_pt_representation.cc index 20bc2ade4d..d6d5116ea4 100644 --- a/src/components/policy/src/sql_pt_representation.cc +++ b/src/components/policy/src/sql_pt_representation.cc @@ -644,7 +644,6 @@ bool SQLPTRepresentation::GatherConsumerFriendlyMessages( if (query.Prepare(sql_pt::kCollectFriendlyMsg)) { while (query.Next()) { - UserFriendlyMessage msg; msg.message_code = query.GetString(7); std::string language = query.GetString(6); -- cgit v1.2.1