diff options
| author | jacobkeeler <jacob.keeler@livioradio.com> | 2017-09-29 09:49:51 -0400 |
|---|---|---|
| committer | jacobkeeler <jacob.keeler@livioradio.com> | 2017-09-29 09:49:51 -0400 |
| commit | 18b0a605c3b665c4de6633acf4a24b7ed6ebbd90 (patch) | |
| tree | c0771a7f4a9116c2d3fd66cce6ef3ed849fa02de /src/components/application_manager | |
| parent | 475aff970c1e4cc8797a0cc3728e496500401838 (diff) | |
| download | sdl_core-18b0a605c3b665c4de6633acf4a24b7ed6ebbd90.tar.gz | |
Fix build errors from merge and remove quotes from error messages
Diffstat (limited to 'src/components/application_manager')
| -rw-r--r-- | src/components/application_manager/src/application_manager_impl.cc | 11 | ||||
| -rw-r--r-- | src/components/application_manager/src/hmi_capabilities_impl.cc | 16 |
2 files changed, 17 insertions, 10 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 4d8b0706fc..616a538f5a 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -2317,8 +2317,10 @@ MessageValidationResult ApplicationManagerImpl::ValidateMessageBySchema( if (!mobile_so_factory().attachSchema(so, true)) { return INVALID_METADATA; } - - if (so.validate() != smart_objects::Errors::OK) { + std::string errorMessage(""); + if (so.validate(errorMessage) != smart_objects::Errors::OK) { + LOG4CXX_WARN(logger_, + "validate() failed for Mobile message - " << errorMessage); return SCHEMA_MISMATCH; } break; @@ -2337,7 +2339,10 @@ MessageValidationResult ApplicationManagerImpl::ValidateMessageBySchema( return INVALID_METADATA; } - if (so.validate() != smart_objects::Errors::OK) { + std::string errorMessage(""); + if (so.validate(errorMessage) != smart_objects::Errors::OK) { + LOG4CXX_WARN(logger_, + "validate() failed for HMI message - " << errorMessage); return SCHEMA_MISMATCH; } break; diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc index 4872361af7..17e9acc81a 100644 --- a/src/components/application_manager/src/hmi_capabilities_impl.cc +++ b/src/components/application_manager/src/hmi_capabilities_impl.cc @@ -1077,7 +1077,9 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { system_capabilities.get("navigationCapability", ""); smart_objects::SmartObject navigation_capability_so; Formatters::CFormatterJsonBase::jsonValueToObj( - navigation_capability, navigation_capability_so); + navigation_capability, + navigation_capability_so, + "navigationCapability"); set_navigation_capability(navigation_capability_so); if (!navigation_capability_so.empty()) { set_navigation_supported(true); @@ -1088,8 +1090,8 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { Json::Value phone_capability = system_capabilities.get("phoneCapability", ""); smart_objects::SmartObject phone_capability_so; - Formatters::CFormatterJsonBase::jsonValueToObj(phone_capability, - phone_capability_so); + Formatters::CFormatterJsonBase::jsonValueToObj( + phone_capability, phone_capability_so, "phoneCapability"); set_phone_capability(phone_capability_so); if (!phone_capability_so.empty()) { set_phone_call_supported(true); @@ -1100,8 +1102,8 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { Json::Value vs_capability = system_capabilities.get("videoStreamingCapability", ""); smart_objects::SmartObject vs_capability_so; - Formatters::CFormatterJsonBase::jsonValueToObj(vs_capability, - vs_capability_so); + Formatters::CFormatterJsonBase::jsonValueToObj( + vs_capability, vs_capability_so, "videoStreamingCapability"); if (vs_capability_so.keyExists("supportedFormats")) { smart_objects::SmartObject& supported_format_array = @@ -1150,8 +1152,8 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { Json::Value rc_capability = system_capabilities.get("remoteControlCapability", ""); smart_objects::SmartObject rc_capability_so; - Formatters::CFormatterJsonBase::jsonValueToObj(rc_capability, - rc_capability_so); + Formatters::CFormatterJsonBase::jsonValueToObj( + rc_capability, rc_capability_so, "remoteControlCapability"); set_rc_capability(rc_capability_so); } } |