From 4bc94c03e7ed97c73fb8dffd295b77ea70d2e314 Mon Sep 17 00:00:00 2001 From: jacobkeeler Date: Thu, 3 Oct 2019 15:32:38 -0400 Subject: Fix CID 204315, 204316 --- .../commands/mobile/get_interior_vehicle_data_consent_request.cc | 5 +---- src/components/application_manager/src/policies/policy_handler.cc | 7 +++++-- 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; } -- cgit v1.2.1