summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacobkeeler <jacob.keeler@livioradio.com>2019-10-03 15:32:38 -0400
committerjacobkeeler <jacob.keeler@livioradio.com>2019-10-03 15:43:12 -0400
commit4bc94c03e7ed97c73fb8dffd295b77ea70d2e314 (patch)
tree5a0de4a40fe7826ac5903179d9f2664b710262ef
parent7c442abce73c462e7724a64b3ce037bcb8e9093e (diff)
downloadsdl_core-4bc94c03e7ed97c73fb8dffd295b77ea70d2e314.tar.gz
Fix CID 204315, 204316
-rw-r--r--src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_request.cc5
-rw-r--r--src/components/application_manager/src/policies/policy_handler.cc7
2 files changed, 6 insertions, 6 deletions
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_request.cc
index 819f5c3fef..fd661afd5f 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_request.cc
@@ -231,10 +231,7 @@ void GetInteriorVehicleDataConsentRequest::on_event(
hmi_response[app_mngr::strings::msg_params];
std::string info;
GetInfo(hmi_response, info);
- SendResponse(success_result,
- result_code,
- info.c_str(),
- success_result ? &response_params : nullptr);
+ SendResponse(success_result, result_code, info.c_str(), &response_params);
}
std::string GetInteriorVehicleDataConsentRequest::ModuleType() const {
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index b92685e278..b0a4c4586d 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -337,8 +337,11 @@ bool PolicyHandler::LoadPolicyLibrary() {
bool PolicyHandler::CreateManager() {
void* policy_handle = dlopen(kLibrary.c_str(), RTLD_LAZY);
const char* error = dlerror();
- if (error) {
- LOG4CXX_ERROR(logger_, error);
+ if (!policy_handle) {
+ LOG4CXX_ERROR(
+ logger_,
+ (error == NULL ? "Unknown error in dlopen while loading policy table"
+ : error));
return false;
}